Fix cyclic dependency between ProfilePolicyConnector and PrefService.

chrome/browser/profiles/profile_io_data.cc

Index: chrome/browser/profiles/profile_io_data.cc
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index 99f3793c0157f18618222399755b10c33e6dcb0b..74779d41caf4f174cb36d26af03d1d6843dd6967 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -63,7 +63,6 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/resource_context.h"
 #include "extensions/common/constants.h"
-#include "net/cert/cert_verifier.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/http/http_transaction_factory.h"
@@ -88,10 +87,10 @@
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/drive/drive_protocol_handler.h"
+#include "chrome/browser/chromeos/policy/network_policy_service.h"
+#include "chrome/browser/chromeos/policy/network_policy_service_factory.h"
 #include "chrome/browser/chromeos/policy/policy_cert_verifier.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
-#include "chrome/browser/policy/profile_policy_connector.h"
-#include "chrome/browser/policy/profile_policy_connector_factory.h"
 #include "chromeos/settings/cros_settings_names.h"
 #endif  // defined(OS_CHROMEOS)
 
@@ -226,18 +225,26 @@ class DebugDevToolsInterceptor
 #if defined(OS_CHROMEOS)
 scoped_ptr<policy::PolicyCertVerifier> CreatePolicyCertVerifier(
     Profile* profile) {
-  policy::ProfilePolicyConnector* connector =
-      policy::ProfilePolicyConnectorFactory::GetForProfile(profile);
-  base::Closure policy_cert_trusted_callback =
-      base::Bind(base::IgnoreResult(&content::BrowserThread::PostTask),
-                 content::BrowserThread::UI,
-                 FROM_HERE,
-                 connector->GetPolicyCertTrustedCallback());
+  policy::NetworkPolicyService* service =
+      policy::NetworkPolicyServiceFactory::GetForProfile(profile);
+  if (!service)
+    return scoped_ptr<policy::PolicyCertVerifier>();
+
   scoped_ptr<policy::PolicyCertVerifier> cert_verifier(
-      new policy::PolicyCertVerifier(policy_cert_trusted_callback));
-  connector->SetPolicyCertVerifier(cert_verifier.get());
+      new policy::PolicyCertVerifier(service->GetPolicyCertTrustedCallback()));
+  service->AddPolicyCertVerifier(cert_verifier.get());
   return cert_verifier.Pass();
 }
+
+void ReleasePolicyCertVerifier(policy::PolicyCertVerifier* cert_verifier,
+                               Profile* profile) {
+  cert_verifier->UnsetTrustAnchorUsedCallback();
+
+  policy::NetworkPolicyService* service =
+      policy::NetworkPolicyServiceFactory::GetForProfile(profile);
+  if (service)
+    service->RemovePolicyCertVerifier(cert_verifier);
+}
 #endif
 }  // namespace
 
@@ -294,9 +301,6 @@ void ProfileIOData::InitializeOnUIThread(Profile* profile) {
   params->managed_mode_url_filter =
       managed_user_service->GetURLFilterForIOThread();
 #endif
-#if defined(OS_CHROMEOS)
-  params->cert_verifier = CreatePolicyCertVerifier(profile);
-#endif
 
   params->profile = profile;
   profile_params_.reset(params.release());
@@ -344,6 +348,9 @@ void ProfileIOData::InitializeOnUIThread(Profile* profile) {
     signin_allowed_.MoveToThread(io_message_loop_proxy);
   }
 
+#if defined(OS_CHROMEOS)
+  cert_verifier_ = CreatePolicyCertVerifier(profile);
+#endif
   // The URLBlacklistManager has to be created on the UI thread to register
   // observers of |pref_service|, and it also has to clean up on
   // ShutdownOnUIThread to release these observers on the right thread.
@@ -825,9 +832,13 @@ void ProfileIOData::Init(content::ProtocolHandlerMap* protocol_handlers) const {
 #endif
 
 #if defined(OS_CHROMEOS)
-  profile_params_->cert_verifier->InitializeOnIOThread();
-  cert_verifier_ = profile_params_->cert_verifier.Pass();
-  main_request_context_->set_cert_verifier(cert_verifier_.get());
+  if (cert_verifier_) {
+    cert_verifier_->InitializeOnIOThread();
+    main_request_context_->set_cert_verifier(cert_verifier_.get());
+  } else {
+    main_request_context_->set_cert_verifier(
+        io_thread_globals->cert_verifier.get());
+  }
 #else
   main_request_context_->set_cert_verifier(
       io_thread_globals->cert_verifier.get());
@@ -911,6 +922,13 @@ scoped_ptr<net::URLRequestJobFactory> ProfileIOData::SetUpJobFactoryDefaults(
   }
 }
 
+void ProfileIOData::ReleaseFromBrowserContextServices(Profile* profile) {
+#if defined(OS_CHROMEOS)
+  if (cert_verifier_)
+    ReleasePolicyCertVerifier(cert_verifier_.get(), profile);
+#endif
+}
+
 void ProfileIOData::ShutdownOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));