Fix cyclic dependency between ProfilePolicyConnector and PrefService.

chrome/browser/policy/profile_policy_connector.cc

Index: chrome/browser/policy/profile_policy_connector.cc
diff --git a/chrome/browser/policy/profile_policy_connector.cc b/chrome/browser/policy/profile_policy_connector.cc
index 76826be1b2e3a1687b20bdace851b321fbc52e99..b5c1187137ff15b8ca4753461f35f78042e1ea22 100644
--- a/chrome/browser/policy/profile_policy_connector.cc
+++ b/chrome/browser/policy/profile_policy_connector.cc
@@ -13,20 +13,14 @@
 #include "chrome/browser/policy/policy_service_impl.h"
 
 #if defined(OS_CHROMEOS)
-#include "base/bind.h"
-#include "base/prefs/pref_service.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/policy/device_local_account_policy_provider.h"
 #include "chrome/browser/chromeos/policy/login_profile_policy_provider.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h"
-#include "chrome/browser/chromeos/policy/user_network_configuration_updater.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/policy/policy_service.h"
-#include "chrome/common/pref_names.h"
-#include "chromeos/network/network_handler.h"
-#include "chromeos/network/onc/onc_certificate_importer_impl.h"
 #else
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager.h"
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
@@ -34,18 +28,19 @@
 
 namespace policy {
 
-ProfilePolicyConnector::ProfilePolicyConnector(Profile* profile)
-    :
+ProfilePolicyConnector::ProfilePolicyConnector()
 #if defined(OS_CHROMEOS)
-      is_primary_user_(false),
-      weak_ptr_factory_(this),
+    : is_primary_user_(false)
 #endif
-      profile_(profile) {}
+      {

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

{}

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

Done.

+}
 
 ProfilePolicyConnector::~ProfilePolicyConnector() {}
 
 void ProfilePolicyConnector::Init(
     bool force_immediate_load,
+    CloudPolicyManager* user_cloud_policy_manager,
+    Profile* profile,
     base::SequencedTaskRunner* sequenced_task_runner) {
   BrowserPolicyConnector* connector =
       g_browser_process->browser_policy_connector();
@@ -53,66 +48,39 @@ void ProfilePolicyConnector::Init(
   // PolicyService of this connector.
   std::vector<ConfigurationPolicyProvider*> providers;
 
+  if (user_cloud_policy_manager)
+    providers.push_back(user_cloud_policy_manager);
+
 #if defined(OS_CHROMEOS)
-  UserCloudPolicyManagerChromeOS* cloud_policy_manager =
-      UserCloudPolicyManagerFactoryChromeOS::GetForProfile(profile_);
-  if (cloud_policy_manager)
-    providers.push_back(cloud_policy_manager);
-
-  bool allow_trusted_certs_from_policy = false;
-  chromeos::User* user = NULL;
-  if (chromeos::ProfileHelper::IsSigninProfile(profile_)) {
+  if (chromeos::ProfileHelper::IsSigninProfile(profile)) {

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

The |profile| is passed in just for this call. I suggest passing in a boolean
"is_signin_profile" instead, and making this test at the
ProfilePolicyConnectorFactory.

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

Done. However, the argument is used only for ChromeOS. Not nice. However, I will
not fix this in this CL, maybe a follow up.

     special_user_policy_provider_.reset(new LoginProfilePolicyProvider(
         connector->GetPolicyService()));
     special_user_policy_provider_->Init();
   } else {
     // |user| should never be NULL except for the signin profile.
-    // TODO(joaodasilva): get the |user| that corresponds to the |profile_|
+    // TODO(joaodasilva): get the |user| that corresponds to the |profile|
     // from the ProfileHelper, once that's ready.
     chromeos::UserManager* user_manager = chromeos::UserManager::Get();
-    user = user_manager->GetActiveUser();
+    chromeos::User* user = user_manager->GetActiveUser();
     CHECK(user);
     std::string username = user->email();
     is_primary_user_ =
         chromeos::UserManager::Get()->GetLoggedInUsers().size() == 1;
     if (user->GetType() == chromeos::User::USER_TYPE_PUBLIC_ACCOUNT)
       InitializeDeviceLocalAccountPolicyProvider(username);
-    // Allow trusted certs from policy only for managed regular accounts.
-    const bool is_managed =
-        connector->GetUserAffiliation(username) == USER_AFFILIATION_MANAGED;
-    if (is_managed && user->GetType() == chromeos::User::USER_TYPE_REGULAR)
-      allow_trusted_certs_from_policy = true;
   }
   if (special_user_policy_provider_)
     providers.push_back(special_user_policy_provider_.get());
-
-#else
-  UserCloudPolicyManager* cloud_policy_manager =
-      UserCloudPolicyManagerFactory::GetForProfile(profile_);
-  if (cloud_policy_manager)
-    providers.push_back(cloud_policy_manager);
 #endif
 
   policy_service_ = connector->CreatePolicyService(providers);
 
 #if defined(OS_CHROMEOS)
   if (is_primary_user_) {
-    if (cloud_policy_manager)
-      connector->SetUserPolicyDelegate(cloud_policy_manager);
+    if (user_cloud_policy_manager)
+      connector->SetUserPolicyDelegate(user_cloud_policy_manager);
     else if (special_user_policy_provider_)
       connector->SetUserPolicyDelegate(special_user_policy_provider_.get());
-
-    // A reference to |user| is stored by the NetworkConfigurationUpdater until
-    // the Updater is destructed during Shutdown.
-    network_configuration_updater_ =
-        UserNetworkConfigurationUpdater::CreateForUserPolicy(
-            allow_trusted_certs_from_policy,
-            *user,
-            scoped_ptr<chromeos::onc::CertificateImporter>(
-                new chromeos::onc::CertificateImporterImpl),
-            policy_service(),
-            chromeos::NetworkHandler::Get()
-                ->managed_network_configuration_handler());
   }
 #endif
 }
@@ -125,45 +93,12 @@ void ProfilePolicyConnector::Shutdown() {
 #if defined(OS_CHROMEOS)
   if (is_primary_user_)
     g_browser_process->browser_policy_connector()->SetUserPolicyDelegate(NULL);
-  network_configuration_updater_.reset();
   if (special_user_policy_provider_)
     special_user_policy_provider_->Shutdown();
 #endif
 }
 
 #if defined(OS_CHROMEOS)
-void ProfilePolicyConnector::SetPolicyCertVerifier(
-    PolicyCertVerifier* cert_verifier) {
-  if (network_configuration_updater_)
-    network_configuration_updater_->SetPolicyCertVerifier(cert_verifier);
-}
-
-base::Closure ProfilePolicyConnector::GetPolicyCertTrustedCallback() {
-  return base::Bind(&ProfilePolicyConnector::SetUsedPolicyCertificatesOnce,
-                    weak_ptr_factory_.GetWeakPtr());
-}
-
-void ProfilePolicyConnector::GetWebTrustedCertificates(
-    net::CertificateList* certs) const {
-  certs->clear();
-  if (network_configuration_updater_)
-    network_configuration_updater_->GetWebTrustedCertificates(certs);
-}
-#endif
-
-bool ProfilePolicyConnector::UsedPolicyCertificates() {
-#if defined(OS_CHROMEOS)
-  return profile_->GetPrefs()->GetBoolean(prefs::kUsedPolicyCertificatesOnce);
-#else
-  return false;
-#endif
-}
-
-#if defined(OS_CHROMEOS)
-void ProfilePolicyConnector::SetUsedPolicyCertificatesOnce() {
-  profile_->GetPrefs()->SetBoolean(prefs::kUsedPolicyCertificatesOnce, true);
-}
-
 void ProfilePolicyConnector::InitializeDeviceLocalAccountPolicyProvider(
     const std::string& username) {
   BrowserPolicyConnector* connector =