Fix cyclic dependency between ProfilePolicyConnector and PrefService.

chrome/browser/chromeos/policy/user_network_configuration_updater.cc

 // Copyright 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/chromeos/policy/user_network_configuration_updater.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/net/onc_utils.h"
 #include "chrome/browser/chromeos/policy/policy_cert_verifier.h"
 #include "chromeos/network/managed_network_configuration_handler.h"
 #include "chromeos/network/onc/onc_certificate_importer.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/cert/x509_certificate.h"
 #include "policy/policy_constants.h"
 
 namespace policy {
 
-UserNetworkConfigurationUpdater::~UserNetworkConfigurationUpdater() {}
+UserNetworkConfigurationUpdater::~UserNetworkConfigurationUpdater() {
+  DCHECK(cert_verifiers_.empty());
+}
 
 // static
 scoped_ptr<UserNetworkConfigurationUpdater>
 UserNetworkConfigurationUpdater::CreateForUserPolicy(
     bool allow_trusted_certs_from_policy,
     const chromeos::User& user,
     scoped_ptr<chromeos::onc::CertificateImporter> certificate_importer,
     PolicyService* policy_service,
     chromeos::ManagedNetworkConfigurationHandler* network_config_handler) {
   scoped_ptr<UserNetworkConfigurationUpdater> updater(
@@ skipping 11 matching lines @@
     const chromeos::User& user,
     scoped_ptr<chromeos::onc::CertificateImporter> certificate_importer,
     PolicyService* policy_service,
     chromeos::ManagedNetworkConfigurationHandler* network_config_handler)
     : NetworkConfigurationUpdater(onc::ONC_SOURCE_USER_POLICY,
                                   key::kOpenNetworkConfiguration,
                                   certificate_importer.Pass(),
                                   policy_service,
                                   network_config_handler),
       allow_trusted_certificates_from_policy_(allow_trusted_certs_from_policy),
-      user_(&user),
-      cert_verifier_(NULL) {}
+      user_(&user) {}
 
-void UserNetworkConfigurationUpdater::SetPolicyCertVerifier(
+void UserNetworkConfigurationUpdater::AddPolicyCertVerifier(
     PolicyCertVerifier* cert_verifier) {
-  cert_verifier_ = cert_verifier;
+  DCHECK(cert_verifiers_.find(cert_verifier) == cert_verifiers_.end());
+  cert_verifiers_.insert(cert_verifier);
   SetTrustAnchors();
 }
 
+void UserNetworkConfigurationUpdater::RemovePolicyCertVerifier(
+    PolicyCertVerifier* cert_verifier) {
+  size_t count = cert_verifiers_.erase(cert_verifier);
+  DCHECK(count > 0);
+}
+
 void UserNetworkConfigurationUpdater::GetWebTrustedCertificates(
     net::CertificateList* certs) const {
   *certs = web_trust_certs_;
 }
 
 void UserNetworkConfigurationUpdater::ImportCertificates(
     const base::ListValue& certificates_onc) {
   web_trust_certs_.clear();
   certificate_importer_->ImportCertificates(
       certificates_onc,
       onc_source_,
       allow_trusted_certificates_from_policy_ ? &web_trust_certs_ : NULL);
 
   SetTrustAnchors();
 }
 
 void UserNetworkConfigurationUpdater::ApplyNetworkPolicy(
     base::ListValue* network_configs_onc,
     base::DictionaryValue* global_network_config) {
   DCHECK(user_);
   chromeos::onc::ExpandStringPlaceholdersInNetworksForUser(user_,
                                                            network_configs_onc);
   network_config_handler_->SetPolicy(onc_source_,
                                      user_->username_hash(),
                                      *network_configs_onc,
                                      *global_network_config);
 }
 
 void UserNetworkConfigurationUpdater::SetTrustAnchors() {
-  if (!cert_verifier_)
-    return;
-  content::BrowserThread::PostTask(
-      content::BrowserThread::IO,
-      FROM_HERE,
-      base::Bind(&PolicyCertVerifier::SetTrustAnchors,
-                 base::Unretained(cert_verifier_),
-                 web_trust_certs_));
+  for (std::set<PolicyCertVerifier*>::const_iterator it =
+           cert_verifiers_.begin();
+       it != cert_verifiers_.end();
+       ++it) {
+    content::BrowserThread::PostTask(
+        content::BrowserThread::IO,
+        FROM_HERE,
+        base::Bind(&PolicyCertVerifier::SetTrustAnchors,
+                   base::Unretained(*it),
+                   web_trust_certs_));

[Joao da Silva, 2013/10/25 11:57:10]

Leave a comment here explaining why it's safe to post an unretained
PolicyCertVerifier from UI to IO.

[pneubeck (no reviews), 2013/10/25 12:17:00]

Done.

+  }
 }
 
 }  // namespace policy