Add DeviceADPolicyManager to provide AD policy.

chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/path_service.h"
 #include "base/sequenced_task_runner.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/attestation/attestation_ca_client.h"
 #include "chrome/browser/chromeos/policy/affiliated_cloud_policy_invalidator.h"
 #include "chrome/browser/chromeos/policy/affiliated_invalidation_service_provider.h"
 #include "chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.h"
 #include "chrome/browser/chromeos/policy/bluetooth_policy_handler.h"
+#include "chrome/browser/chromeos/policy/device_ad_policy_manager.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_initializer.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_local_account.h"
 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
 #include "chrome/browser/chromeos/policy/device_network_configuration_updater.h"
 #include "chrome/browser/chromeos/policy/enrollment_config.h"
 #include "chrome/browser/chromeos/policy/remote_commands/affiliated_remote_commands_invalidator.h"
 #include "chrome/browser/chromeos/policy/server_backed_state_keys_broker.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
@@ skipping 36 matching lines @@
 scoped_refptr<base::SequencedTaskRunner> GetBackgroundTaskRunner() {
   base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool();
   CHECK(pool);
   return pool->GetSequencedTaskRunnerWithShutdownBehavior(
       pool->GetSequenceToken(), base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
 }
 
 }  // namespace
 
 BrowserPolicyConnectorChromeOS::BrowserPolicyConnectorChromeOS()
-    : device_cloud_policy_manager_(nullptr),
-      global_user_cloud_policy_provider_(nullptr),
-      weak_ptr_factory_(this) {
+    : weak_ptr_factory_(this) {
   if (g_testing_install_attributes) {
     install_attributes_.reset(g_testing_install_attributes);
     g_testing_install_attributes = nullptr;
   }
 
   // SystemSaltGetter or DBusThreadManager may be uninitialized on unit tests.
 
   // TODO(satorux): Remove SystemSaltGetter::IsInitialized() when it's ready
   // (removing it now breaks tests). crbug.com/141016.
   if (chromeos::SystemSaltGetter::IsInitialized() &&
       chromeos::DBusThreadManager::IsInitialized()) {
-    state_keys_broker_ = base::MakeUnique<ServerBackedStateKeysBroker>(
-        chromeos::DBusThreadManager::Get()->GetSessionManagerClient(),
-        base::ThreadTaskRunnerHandle::Get());
-
-    chromeos::CryptohomeClient* cryptohome_client =
-        chromeos::DBusThreadManager::Get()->GetCryptohomeClient();
-
     // Don't initialize install attributes if g_testing_install_attributes have
     // been injected.
     if (!install_attributes_) {
+      chromeos::CryptohomeClient* cryptohome_client =
+          chromeos::DBusThreadManager::Get()->GetCryptohomeClient();
       install_attributes_ =
           base::MakeUnique<chromeos::InstallAttributes>(cryptohome_client);
       base::FilePath install_attrs_file;
       CHECK(PathService::Get(chromeos::FILE_INSTALL_ATTRIBUTES,
                              &install_attrs_file));
       install_attributes_->Init(install_attrs_file);
     }
 
     std::unique_ptr<DeviceCloudPolicyStoreChromeOS> device_cloud_policy_store =
         base::MakeUnique<DeviceCloudPolicyStoreChromeOS>(
             chromeos::DeviceSettingsService::Get(), install_attributes_.get(),
             GetBackgroundTaskRunner());
-    device_cloud_policy_manager_ = new DeviceCloudPolicyManagerChromeOS(
-        std::move(device_cloud_policy_store),
-        base::ThreadTaskRunnerHandle::Get(), state_keys_broker_.get());
-    AddPolicyProvider(std::unique_ptr<ConfigurationPolicyProvider>(
-        device_cloud_policy_manager_));
+
+    if (install_attributes_->IsEnterpriseAD()) {
+      device_ad_policy_manager_ =
+          new DeviceADPolicyManager(std::move(device_cloud_policy_store));
+      AddPolicyProvider(std::unique_ptr<ConfigurationPolicyProvider>(

[emaxx, 2016/11/11 15:25:08]

nit: Use base::WrapUnique?

[Thiemo Nagel, 2016/11/16 19:11:01]

Done.

+          device_ad_policy_manager_));
+    } else {
+      state_keys_broker_ = base::MakeUnique<ServerBackedStateKeysBroker>(
+          chromeos::DBusThreadManager::Get()->GetSessionManagerClient(),
+          base::ThreadTaskRunnerHandle::Get());
+
+      device_cloud_policy_manager_ = new DeviceCloudPolicyManagerChromeOS(
+          std::move(device_cloud_policy_store),
+          base::ThreadTaskRunnerHandle::Get(), state_keys_broker_.get());
+      AddPolicyProvider(std::unique_ptr<ConfigurationPolicyProvider>(
+          device_cloud_policy_manager_));
+    }
   }
 
   global_user_cloud_policy_provider_ = new ProxyPolicyProvider();
   AddPolicyProvider(std::unique_ptr<ConfigurationPolicyProvider>(
       global_user_cloud_policy_provider_));
 }
 
 BrowserPolicyConnectorChromeOS::~BrowserPolicyConnectorChromeOS() {}
 
 void BrowserPolicyConnectorChromeOS::Init(
     PrefService* local_state,
     scoped_refptr<net::URLRequestContextGetter> request_context) {
   local_state_ = local_state;
   ChromeBrowserPolicyConnector::Init(local_state, request_context);
 
   affiliated_invalidation_service_provider_ =
       base::MakeUnique<AffiliatedInvalidationServiceProviderImpl>();
 
   if (device_cloud_policy_manager_) {
     // Note: for now the |device_cloud_policy_manager_| is using the global
     // schema registry. Eventually it will have its own registry, once device
     // cloud policy for extensions is introduced. That means it'd have to be
     // initialized from here instead of BrowserPolicyConnector::Init().
 
     device_cloud_policy_manager_->Initialize(local_state);
     device_cloud_policy_manager_->AddDeviceCloudPolicyManagerObserver(this);
     RestartDeviceCloudPolicyInitializer();
   }
 
-  device_local_account_policy_service_ =
-      base::MakeUnique<DeviceLocalAccountPolicyService>(
-          chromeos::DBusThreadManager::Get()->GetSessionManagerClient(),
-          chromeos::DeviceSettingsService::Get(), chromeos::CrosSettings::Get(),
-          affiliated_invalidation_service_provider_.get(),
-          GetBackgroundTaskRunner(), GetBackgroundTaskRunner(),
-          GetBackgroundTaskRunner(),
-          content::BrowserThread::GetTaskRunnerForThread(
-              content::BrowserThread::IO),
-          request_context);
-  device_local_account_policy_service_->Connect(device_management_service());
+  DCHECK(install_attributes_);
+  if (!install_attributes_->IsEnterpriseAD()) {
+    device_local_account_policy_service_ =
+        base::MakeUnique<DeviceLocalAccountPolicyService>(
+            chromeos::DBusThreadManager::Get()->GetSessionManagerClient(),
+            chromeos::DeviceSettingsService::Get(),
+            chromeos::CrosSettings::Get(),
+            affiliated_invalidation_service_provider_.get(),
+            GetBackgroundTaskRunner(), GetBackgroundTaskRunner(),
+            GetBackgroundTaskRunner(),
+            content::BrowserThread::GetTaskRunnerForThread(
+                content::BrowserThread::IO),
+            request_context);
+    device_local_account_policy_service_->Connect(device_management_service());
+  }
+
   if (device_cloud_policy_manager_) {
     device_cloud_policy_invalidator_ =
         base::MakeUnique<AffiliatedCloudPolicyInvalidator>(
             enterprise_management::DeviceRegisterRequest::DEVICE,
             device_cloud_policy_manager_->core(),
             affiliated_invalidation_service_provider_.get());
     device_remote_commands_invalidator_ =
         base::MakeUnique<AffiliatedRemoteCommandsInvalidator>(
             device_cloud_policy_manager_->core(),
             affiliated_invalidation_service_provider_.get());
@@ skipping 178 matching lines @@
         device_cloud_policy_manager_->device_store()->policy();
     if (policy_data) {
       affiliation_ids.insert(policy_data->device_affiliation_ids().begin(),
                              policy_data->device_affiliation_ids().end());
     }
   }
   return affiliation_ids;
 }
 
 }  // namespace policy