Setup Chromad user policy plumbing

chrome/browser/policy/profile_policy_connector_factory.cc

 // Copyright (c) 2013 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/policy/profile_policy_connector_factory.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/policy/schema_registry_service.h"
 #include "chrome/browser/policy/schema_registry_service_factory.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/policy/core/common/policy_service.h"
 #include "components/policy/core/common/policy_service_impl.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
+#include "chrome/browser/chromeos/policy/user_active_directory_policy_manager.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
-#include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h"
+#include "chrome/browser/chromeos/policy/user_policy_manager_factory_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "components/user_manager/user.h"
 #else  // Non-ChromeOS.
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
 #endif
 
 namespace policy {
 
 // static
@@ skipping 28 matching lines @@
     ConfigurationPolicyProvider* provider) {
   test_providers_.push_back(provider);
 }
 
 ProfilePolicyConnectorFactory::ProfilePolicyConnectorFactory()
     : BrowserContextKeyedBaseFactory(
         "ProfilePolicyConnector",
         BrowserContextDependencyManager::GetInstance()) {
   DependsOn(SchemaRegistryServiceFactory::GetInstance());
 #if defined(OS_CHROMEOS)
-  DependsOn(UserCloudPolicyManagerFactoryChromeOS::GetInstance());
+  DependsOn(UserPolicyManagerFactoryChromeOS::GetInstance());
 #else
   DependsOn(UserCloudPolicyManagerFactory::GetInstance());
 #endif
 }
 
 ProfilePolicyConnectorFactory::~ProfilePolicyConnectorFactory() {
   DCHECK(connectors_.empty());
 }
 
 ProfilePolicyConnector*
 ProfilePolicyConnectorFactory::GetForBrowserContextInternal(
     content::BrowserContext* context) {
   // Get the connector for the original Profile, so that the incognito Profile
   // gets managed settings from the same PolicyService.
   content::BrowserContext* const original_context =
       chrome::GetBrowserContextRedirectedInIncognito(context);
   const ConnectorMap::const_iterator it = connectors_.find(original_context);
   CHECK(it != connectors_.end());
   return it->second;
 }
 
 std::unique_ptr<ProfilePolicyConnector>
 ProfilePolicyConnectorFactory::CreateForBrowserContextInternal(
     content::BrowserContext* context,
     bool force_immediate_load) {
   DCHECK(connectors_.find(context) == connectors_.end());
 
-  SchemaRegistry* schema_registry = nullptr;
-  CloudPolicyManager* user_cloud_policy_manager = nullptr;
+  const user_manager::User* user = nullptr;
+  SchemaRegistry* schema_registry =
+      SchemaRegistryServiceFactory::GetForContext(context)->registry();
 
-  schema_registry =
-      SchemaRegistryServiceFactory::GetForContext(context)->registry();
+  ConfigurationPolicyProvider* policy_provider = nullptr;
+  const CloudPolicyStore* policy_store = nullptr;
 
 #if defined(OS_CHROMEOS)
   Profile* const profile = Profile::FromBrowserContext(context);
-  const user_manager::User* user = nullptr;
   if (chromeos::ProfileHelper::IsSigninProfile(profile)) {
     policy::DeviceCloudPolicyManagerChromeOS* device_cloud_policy_manager =
         g_browser_process->platform_part()
             ->browser_policy_connector_chromeos()
             ->GetDeviceCloudPolicyManager();
     // TODO(tnagel): Do we need to do something for Active Directory management?
     if (device_cloud_policy_manager) {
       device_cloud_policy_manager->SetSigninProfileSchemaRegistry(
           schema_registry);
     }
   } else {
     user = chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
     CHECK(user);
   }
-  user_cloud_policy_manager =
-      UserCloudPolicyManagerFactoryChromeOS::GetForProfile(profile);
+
+  CloudPolicyManager* user_cloud_policy_manager =
+      UserPolicyManagerFactoryChromeOS::GetCloudPolicyManagerForProfile(
+          profile);
+  UserActiveDirectoryPolicyManager* active_directory_manager =
+      UserPolicyManagerFactoryChromeOS::
+          GetActiveDirectoryPolicyManagerForProfile(profile);
+  if (user_cloud_policy_manager) {
+    policy_provider = user_cloud_policy_manager;
+    policy_store = user_cloud_policy_manager->core()->store();
+  } else if (active_directory_manager) {

[Thiemo Nagel, 2016/12/29 15:08:28]

I've flattened the code nesting in the same way as you had proposed for webui.

+    policy_provider = active_directory_manager;
+    policy_store = active_directory_manager->store();
+  }
 #else
-  user_cloud_policy_manager =
+  CloudPolicyManager* user_cloud_policy_manager =
       UserCloudPolicyManagerFactory::GetForBrowserContext(context);
+  if (user_cloud_policy_manager) {
+    policy_provider = user_cloud_policy_manager;
+    policy_store = user_cloud_policy_manager->core()->store();
+  }
 #endif  // defined(OS_CHROMEOS)
 
   std::unique_ptr<ProfilePolicyConnector> connector(
       new ProfilePolicyConnector());
 
   if (test_providers_.empty()) {
-    connector->Init(
-#if defined(OS_CHROMEOS)
-        user,
-#endif
-        schema_registry, user_cloud_policy_manager);
+    connector->Init(user, schema_registry, policy_provider, policy_store);
   } else {
     PolicyServiceImpl::Providers providers;
     providers.push_back(test_providers_.front());
     test_providers_.pop_front();
     std::unique_ptr<PolicyService> service(new PolicyServiceImpl(providers));
     connector->InitForTesting(std::move(service));
   }
 
   connectors_[context] = connector.get();
   return connector;
@@ skipping 21 matching lines @@
 
 bool ProfilePolicyConnectorFactory::HasTestingFactory(
     content::BrowserContext* context) {
   return false;
 }
 
 void ProfilePolicyConnectorFactory::CreateServiceNow(
     content::BrowserContext* context) {}
 
 }  // namespace policy