Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(823)

Unified Diff: chrome/browser/policy/profile_policy_connector_factory.cc

Issue 24153012: Fix cyclic dependency between ProfilePolicyConnector and PrefService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix/Extend NetworkConfigurationUpdater unit test. Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 55369ac37838c890e53e43a3622d940599c61b90..11be1104e59d5a7354bc97ab04a80c25f2ed5414 100644
--- a/chrome/browser/policy/profile_policy_connector_factory.cc
+++ b/chrome/browser/policy/profile_policy_connector_factory.cc
@@ -102,7 +102,7 @@ ProfilePolicyConnectorFactory::CreateForProfileInternal(
#else
CloudPolicyManager* user_cloud_policy_manager = NULL;
#endif
- ProfilePolicyConnector* connector = new ProfilePolicyConnector(profile);
+ ProfilePolicyConnector* connector = new ProfilePolicyConnector();
connector->Init(force_immediate_load,
#if defined(ENABLE_CONFIGURATION_POLICY) && defined(OS_CHROMEOS)
user,
@@ -132,12 +132,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,

Powered by Google App Engine
This is Rietveld 408576698