Fix cyclic dependency between ProfilePolicyConnector and PrefService.

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 "base/logging.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 
 #if defined(ENABLE_CONFIGURATION_POLICY)
 #if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_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"
 #else
+#include "chrome/browser/policy/cloud/user_cloud_policy_manager.h"
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
 #endif
 #endif
 
 namespace policy {
 
 // static
 ProfilePolicyConnectorFactory* ProfilePolicyConnectorFactory::GetInstance() {
   return Singleton<ProfilePolicyConnectorFactory>::get();
 }
 
 // static
 ProfilePolicyConnector* ProfilePolicyConnectorFactory::GetForProfile(
     Profile* profile) {
   return GetInstance()->GetForProfileInternal(profile);
 }
 
 // static
 scoped_ptr<ProfilePolicyConnector>
     ProfilePolicyConnectorFactory::CreateForProfile(
         Profile* profile,
         bool force_immediate_load,
         base::SequencedTaskRunner* sequenced_task_runner) {
-  return GetInstance()->CreateForProfileInternal(
-      profile, force_immediate_load, sequenced_task_runner);
+  return GetInstance()->CreateForProfileInternal(profile,
+                                                 force_immediate_load,
+                                                 sequenced_task_runner);
 }
 
 void ProfilePolicyConnectorFactory::SetServiceForTesting(
     Profile* profile,
     ProfilePolicyConnector* connector) {
   ProfilePolicyConnector*& map_entry = connectors_[profile];
   CHECK(!map_entry);
   map_entry = connector;
 }
 
@@ skipping 23 matching lines @@
   CHECK(it != connectors_.end());
   return it->second;
 }
 
 scoped_ptr<ProfilePolicyConnector>
     ProfilePolicyConnectorFactory::CreateForProfileInternal(
         Profile* profile,
         bool force_immediate_load,
         base::SequencedTaskRunner* sequenced_task_runner) {
   DCHECK(connectors_.find(profile) == connectors_.end());
-  ProfilePolicyConnector* connector = new ProfilePolicyConnector(profile);
-  connector->Init(force_immediate_load, sequenced_task_runner);
+#if defined(ENABLE_CONFIGURATION_POLICY) && defined(OS_CHROMEOS)
+  chromeos::User* user = NULL;
+  if (!profile->IsLoginProfile()) {
+    chromeos::UserManager* user_manager = chromeos::UserManager::Get();
+    user = user_manager->GetUserByProfile(profile);
+    CHECK(user);
+  }
+  CloudPolicyManager* user_cloud_policy_manager =
+      UserCloudPolicyManagerFactoryChromeOS::GetForProfile(profile);
+#else
+  CloudPolicyManager* user_cloud_policy_manager =
+      UserCloudPolicyManagerFactory::GetForProfile(profile);
+#endif
+  ProfilePolicyConnector* connector = new ProfilePolicyConnector();
+  connector->Init(force_immediate_load,
+#if defined(ENABLE_CONFIGURATION_POLICY) && defined(OS_CHROMEOS)
+                  user,
+#endif
+                  user_cloud_policy_manager,
+                  sequenced_task_runner);
   connectors_[profile] = connector;
-  return scoped_ptr<ProfilePolicyConnector>(connector);
+  return make_scoped_ptr(connector);
 }
 
 void ProfilePolicyConnectorFactory::BrowserContextShutdown(
     content::BrowserContext* context) {
   Profile* profile = static_cast<Profile*>(context);
   if (profile->IsOffTheRecord())
     return;
   ConnectorMap::iterator it = connectors_.find(profile);
   if (it != connectors_.end())
     it->second->Shutdown();
 }
 
 void ProfilePolicyConnectorFactory::BrowserContextDestroyed(
     content::BrowserContext* context) {
   ConnectorMap::iterator it = connectors_.find(static_cast<Profile*>(context));
   if (it != connectors_.end())
     connectors_.erase(it);
   BrowserContextKeyedBaseFactory::BrowserContextDestroyed(context);
 }
 
 void ProfilePolicyConnectorFactory::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
 #if defined(OS_CHROMEOS)
   registry->RegisterBooleanPref(
       prefs::kUsedPolicyCertificatesOnce,
       false,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);

[Joao da Silva, 2013/10/16 12:44:58]

This registration should move to network_policy_service_factory

[pneubeck (no reviews), 2013/10/22 18:47:41]

Done.

 #endif
 #if defined(OS_ANDROID)
   registry->RegisterListPref(
       prefs::kManagedBookmarks,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 #endif
 }
 
 void ProfilePolicyConnectorFactory::SetEmptyTestingFactory(
     content::BrowserContext* context) {}
 
 void ProfilePolicyConnectorFactory::CreateServiceNow(
     content::BrowserContext* context) {}
 
 }  // namespace policy