Fix cyclic dependency between ProfilePolicyConnector and PrefService.

chrome/browser/policy/profile_policy_connector_factory.cc

Index: chrome/browser/policy/profile_policy_connector_factory.cc
diff --git a/chrome/browser/policy/profile_policy_connector_factory.cc b/chrome/browser/policy/profile_policy_connector_factory.cc
index e8b7bc35056ce294568e2dae6011fc972312a373..91184772da61cab6c0705107da12d0c44b4ab0ae 100644
--- a/chrome/browser/policy/profile_policy_connector_factory.cc
+++ b/chrome/browser/policy/profile_policy_connector_factory.cc
@@ -13,9 +13,12 @@
 
 #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
@@ -35,9 +38,8 @@ ProfilePolicyConnector* ProfilePolicyConnectorFactory::GetForProfile(
 
 // static
 scoped_ptr<ProfilePolicyConnector>
-    ProfilePolicyConnectorFactory::CreateForProfile(
-        Profile* profile,
-        bool force_immediate_load) {
+ProfilePolicyConnectorFactory::CreateForProfile(Profile* profile,
+                                                bool force_immediate_load) {
   return GetInstance()->CreateForProfileInternal(profile, force_immediate_load);
 }
 
@@ -77,14 +79,31 @@ ProfilePolicyConnector*
 }
 
 scoped_ptr<ProfilePolicyConnector>
-    ProfilePolicyConnectorFactory::CreateForProfileInternal(
-        Profile* profile,
-        bool force_immediate_load) {
+ProfilePolicyConnectorFactory::CreateForProfileInternal(
+    Profile* profile,
+    bool force_immediate_load) {
   DCHECK(connectors_.find(profile) == connectors_.end());
-  ProfilePolicyConnector* connector = new ProfilePolicyConnector(profile);
-  connector->Init(force_immediate_load);
+#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);
   connectors_[profile] = connector;
-  return scoped_ptr<ProfilePolicyConnector>(connector);
+  return make_scoped_ptr(connector);
 }
 
 void ProfilePolicyConnectorFactory::BrowserContextShutdown(
@@ -107,12 +126,6 @@ void ProfilePolicyConnectorFactory::BrowserContextDestroyed(
 
 void ProfilePolicyConnectorFactory::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
-#if defined(OS_CHROMEOS)
-  registry->RegisterBooleanPref(
-      prefs::kUsedPolicyCertificatesOnce,
-      false,
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-#endif
 #if defined(OS_ANDROID)
   registry->RegisterListPref(
       prefs::kManagedBookmarks,