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"
@@ skipping 20 matching lines @@
 ProfilePolicyConnector* ProfilePolicyConnectorFactory::GetForProfile(
     Profile* profile) {
   return GetInstance()->GetForProfileInternal(profile);
 }
 
 // static
 scoped_ptr<ProfilePolicyConnector>
     ProfilePolicyConnectorFactory::CreateForProfile(
         Profile* profile,
         bool force_immediate_load,
+        CloudPolicyManager* user_cloud_policy_manager,

[Joao da Silva, 2013/09/20 13:00:01]

I don't think this should come in  in this call.

This factory declares that it depends on
UserCloudPolicyManagerFactory[ChromeOS], so I think it's more idiomatic to get
the manager using the UCPMFactory from here.

Passing the manager to the ctor of ProfilePolicyConnector is a good idea.

[pneubeck (no reviews), 2013/10/15 13:23:11]

Done.

         base::SequencedTaskRunner* sequenced_task_runner) {
-  return GetInstance()->CreateForProfileInternal(
-      profile, force_immediate_load, sequenced_task_runner);
+  return GetInstance()->CreateForProfileInternal(profile,
+                                                 force_immediate_load,
+                                                 user_cloud_policy_manager,
+                                                 sequenced_task_runner);
 }
 
 void ProfilePolicyConnectorFactory::SetServiceForTesting(
     Profile* profile,
     ProfilePolicyConnector* connector) {
   ProfilePolicyConnector*& map_entry = connectors_[profile];
   CHECK(!map_entry);
   map_entry = connector;
 }
 
@@ skipping 21 matching lines @@
   ConnectorMap::const_iterator it =
       connectors_.find(profile->GetOriginalProfile());
   CHECK(it != connectors_.end());
   return it->second;
 }
 
 scoped_ptr<ProfilePolicyConnector>
     ProfilePolicyConnectorFactory::CreateForProfileInternal(
         Profile* profile,
         bool force_immediate_load,
+        CloudPolicyManager* user_cloud_policy_manager,
         base::SequencedTaskRunner* sequenced_task_runner) {
   DCHECK(connectors_.find(profile) == connectors_.end());
-  ProfilePolicyConnector* connector = new ProfilePolicyConnector(profile);
-  connector->Init(force_immediate_load, sequenced_task_runner);
+  ProfilePolicyConnector* connector = new ProfilePolicyConnector();
+  connector->Init(force_immediate_load,
+                  user_cloud_policy_manager,
+                  profile,
+                  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();
@@ skipping 22 matching lines @@
 #endif
 }
 
 void ProfilePolicyConnectorFactory::SetEmptyTestingFactory(
     content::BrowserContext* context) {}
 
 void ProfilePolicyConnectorFactory::CreateServiceNow(
     content::BrowserContext* context) {}
 
 }  // namespace policy