Fix cyclic dependency between ProfilePolicyConnector and PrefService.

chrome/browser/chromeos/policy/network_configuration_updater_unittest.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 "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/policy/policy_cert_verifier.h"
 #include "chrome/browser/chromeos/policy/user_network_configuration_updater.h"
 #include "chrome/browser/policy/external_data_fetcher.h"
 #include "chrome/browser/policy/mock_configuration_policy_provider.h"
@@ skipping 241 matching lines @@
               SetPolicy(onc::ONC_SOURCE_USER_POLICY, _, _, _));
   EXPECT_CALL(*certificate_importer_, ImportCertificates(_, _, _))
       .WillRepeatedly(SetCertificateList(cert_list));
 
   UserNetworkConfigurationUpdater* updater =
       CreateNetworkConfigurationUpdaterForUserPolicy(
           false /* do not allow trusted certs from policy */);
 
   // Certificates with the "Web" trust flag set should not be forwarded to the
   // trust provider.
-  policy::PolicyCertVerifier cert_verifier((
-      base::Closure() /* no policy cert trusted callback */));
-  updater->SetPolicyCertVerifier(&cert_verifier);
+  policy::PolicyCertVerifier cert_verifier(base::Bind(&base::DoNothing));
+  updater->AddPolicyCertVerifier(&cert_verifier);
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(cert_verifier.GetAdditionalTrustAnchors().empty());
 
-  // |cert_verifier| must outlive the updater.
+  updater->RemovePolicyCertVerifier(&cert_verifier);
   network_configuration_updater_.reset();
+
+  cert_verifier.UnsetTrustAnchorUsedCallback();
 }
 
 TEST_F(NetworkConfigurationUpdaterTest, AllowTrustedCertificatesFromPolicy) {
   net::CertificateList cert_list;
   cert_list =
       net::CreateCertificateListFromFile(net::GetTestCertsDirectory(),
                                          "ok_cert.pem",
                                          net::X509Certificate::FORMAT_AUTO);
   ASSERT_EQ(1u, cert_list.size());
 
   EXPECT_CALL(network_config_handler_,
               SetPolicy(onc::ONC_SOURCE_USER_POLICY, _, _, _));
   EXPECT_CALL(*certificate_importer_,
               ImportCertificates(_, onc::ONC_SOURCE_USER_POLICY, _))
       .WillRepeatedly(SetCertificateList(cert_list));
 
   UserNetworkConfigurationUpdater* updater =
       CreateNetworkConfigurationUpdaterForUserPolicy(
           true /* allow trusted certs from policy */);
 
   // Certificates with the "Web" trust flag set should be forwarded to the
   // trust provider.
-  policy::PolicyCertVerifier cert_verifier((
-      base::Closure() /* no policy cert trusted callback */));
-  updater->SetPolicyCertVerifier(&cert_verifier);
+  policy::PolicyCertVerifier cert_verifier(base::Bind(&base::DoNothing));
+  updater->AddPolicyCertVerifier(&cert_verifier);
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(1u, cert_verifier.GetAdditionalTrustAnchors().size());
 
-  // |cert_verifier| must outlive the updater.
+  updater->RemovePolicyCertVerifier(&cert_verifier);
   network_configuration_updater_.reset();
+
+  cert_verifier.UnsetTrustAnchorUsedCallback();
 }
 
 class NetworkConfigurationUpdaterTestWithParam
     : public NetworkConfigurationUpdaterTest,
       public testing::WithParamInterface<const char*> {
  protected:
   // Returns the currently tested ONC source.
   onc::ONCSource CurrentONCSource() {
     if (GetParam() == key::kOpenNetworkConfiguration)
       return onc::ONC_SOURCE_USER_POLICY;
@@ skipping 73 matching lines @@
   policy.Erase(GetParam());
   UpdateProviderPolicy(policy);
 }
 
 INSTANTIATE_TEST_CASE_P(NetworkConfigurationUpdaterTestWithParamInstance,
                         NetworkConfigurationUpdaterTestWithParam,
                         testing::Values(key::kDeviceOpenNetworkConfiguration,
                                         key::kOpenNetworkConfiguration));
 
 }  // namespace policy