From 3bfc9e3eb223dca44ef3cf0b82832da7c27358eb Mon Sep 17 00:00:00 2001
From: rsorokin <rsorokin@chromium.org>
Date: Thu, 1 Dec 2016 06:03:12 -0800
Subject: [PATCH] Start authpolicyd

Start in two places:
-On press custom shortcut (Ctrl-Alt-Shift-A) for the enrollment
-On reading install attributes in case it's Active Directory managed
device.

BUG=638663
TEST=manual

Review-Url: https://codereview.chromium.org/2530833002
Cr-Commit-Position: refs/heads/master@{#435603}
---
 .../chromeos/policy/browser_policy_connector_chromeos.cc    | 5 +++++
 .../ui/webui/chromeos/login/signin_screen_handler.cc        | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
index 11f8303c5801c5..bcdcf12bffefb9 100644
--- a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
+++ b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
@@ -45,6 +45,7 @@
 #include "chromeos/cryptohome/system_salt_getter.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/upstart_client.h"
 #include "chromeos/network/network_handler.h"
 #include "chromeos/network/onc/onc_certificate_importer_impl.h"
 #include "chromeos/settings/cros_settings_names.h"
@@ -110,6 +111,10 @@ BrowserPolicyConnectorChromeOS::BrowserPolicyConnectorChromeOS()
             GetBackgroundTaskRunner());
 
     if (install_attributes_->IsActiveDirectoryManaged()) {
+      chromeos::DBusThreadManager::Get()
+          ->GetUpstartClient()
+          ->StartAuthPolicyService();
+
       device_active_directory_policy_manager_ =
           new DeviceActiveDirectoryPolicyManager(
               std::move(device_cloud_policy_store));
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
index 9efae546cc4544..0fabe86f09722c 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -75,6 +75,7 @@
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
+#include "chromeos/dbus/upstart_client.h"
 #include "chromeos/login/auth/key.h"
 #include "chromeos/login/auth/user_context.h"
 #include "chromeos/network/network_state.h"
@@ -1198,12 +1199,17 @@ void SigninScreenHandler::HandleToggleEnrollmentScreen() {
 }
 
 void SigninScreenHandler::HandleToggleEnrollmentAd() {
+  // TODO(rsorokin): Cleanup enrollment flow for Active Directory. (see
+  // crbug.com/668491).
   if (chrome::GetChannel() == version_info::Channel::BETA ||
       chrome::GetChannel() == version_info::Channel::STABLE) {
     return;
   }
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       chromeos::switches::kEnableAd);
+  chromeos::DBusThreadManager::Get()
+      ->GetUpstartClient()
+      ->StartAuthPolicyService();
   HandleToggleEnrollmentScreen();
 }