Don't start device cloud policy connection after Chromad enrollment

chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc

Index: chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc b/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc
index 0d9495cae772967d26d78e151c86dc28cfd86059..d4fa52990c6d92427bda3cf14cb6a521ea66fccc 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc
@@ -279,8 +279,10 @@ void DeviceCloudPolicyInitializer::TryToCreateClient() {
 
 void DeviceCloudPolicyInitializer::StartConnection(
     std::unique_ptr<CloudPolicyClient> client) {
-  if (!manager_->core()->service())
+  if (!manager_->core()->service() &&
+      !install_attributes_->IsActiveDirectoryManaged()) {

[emaxx, 2017/01/18 15:33:56]

I think that it would be clearer if StartConnection() won't be called for the
Active Directory case in the first place. It's easy to miss the condition when
it's checked here, or to underestimate its importance in the AD workflow.

[Thiemo Nagel, 2017/01/18 17:27:04]

Done.

     manager_->StartConnection(std::move(client), install_attributes_);
+  }
 }
 
 bool DeviceCloudPolicyInitializer::GetMachineFlag(const std::string& key,