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 9d052606f472925a00424ec272d2cf4d5bf3f097..d9f40615fbe46d69845c6bc0ac35f877c92e7ea2 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
@@ -39,8 +42,9 @@ scoped_ptr<ProfilePolicyConnector>
         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(
@@ -84,10 +88,28 @@ scoped_ptr<ProfilePolicyConnector>
         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(