Fix cyclic dependency between ProfilePolicyConnector and PrefService.

chrome/browser/chromeos/policy/policy_cert_verifier_browsertest.cc

 // Copyright (c) 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/policy_cert_verifier.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
@@ skipping 24 matching lines @@
 class PolicyCertVerifierTest : public testing::Test {
  public:
   PolicyCertVerifierTest() : cert_db_(NULL), trust_anchor_used_(false) {}
 
   virtual ~PolicyCertVerifierTest() {}
 
   virtual void SetUp() OVERRIDE {
     ASSERT_TRUE(test_nssdb_.is_open());
     cert_db_ = net::NSSCertDatabase::GetInstance();
 
-    cert_verifier_.reset(new PolicyCertVerifier(base::Bind(
-        &PolicyCertVerifierTest::OnTrustAnchorUsed, base::Unretained(this))));
+    cert_verifier_.reset(new PolicyCertVerifier());
+    cert_verifier_subscription_ = cert_verifier_->RegisterAnchorUsedCallback(
+        base::Bind(&PolicyCertVerifierTest::OnTrustAnchorUsed,
+                   base::Unretained(this)));
     cert_verifier_->InitializeOnIOThread();
 
     test_ca_cert_ = LoadCertificate("root_ca_cert.pem", net::CA_CERT);
     ASSERT_TRUE(test_ca_cert_);
     test_server_cert_ = LoadCertificate("ok_cert.pem", net::SERVER_CERT);
     ASSERT_TRUE(test_server_cert_);
     test_ca_cert_list_.push_back(test_ca_cert_);
   }
 
   virtual void TearDown() OVERRIDE {
-    // Destroy |cert_verifier_| before destroying the ThreadBundle, otherwise
+    cert_verifier_subscription_.reset();
+      // Destroy |cert_verifier_| before destroying the ThreadBundle, otherwise

[Joao da Silva, 2013/10/16 12:44:58]

indent

[pneubeck (no reviews), 2013/10/22 18:47:41]

Done.

     // BrowserThread::CurrentlyOn checks fail.
+    cert_verifier_->ShutdownOnUIThread();
     cert_verifier_.reset();
   }
 
  protected:
   int VerifyTestServerCert(const net::TestCompletionCallback& test_callback,
                            net::CertVerifyResult* verify_result,
                            net::CertVerifier::RequestHandle* request_handle) {
     return cert_verifier_->Verify(test_server_cert_.get(),
                                   "127.0.0.1",
                                   0,
@@ skipping 13 matching lines @@
   // Returns whether |cert_verifier| signalled usage of one of the additional
   // trust anchors (i.e. of |test_ca_cert_|) for the first time or since the
   // last call of this function.
   bool WasTrustAnchorUsedAndReset() {
     base::RunLoop().RunUntilIdle();
     bool result = trust_anchor_used_;
     trust_anchor_used_ = false;
     return result;
   }
 
+ private:
+  scoped_ptr<base::CallbackList<void()>::Subscription>
+      cert_verifier_subscription_;

[Joao da Silva, 2013/10/16 12:44:58]

Can't this come below after |thread_bundle_|, since it's reset() on TearDown()
anyway?

[pneubeck (no reviews), 2013/10/22 18:47:41]

Yes. I think the reason why I moved it here vanished during some change...
Done.

+
+ public:
   // |test_ca_cert_| is the issuer of |test_server_cert_|.
   scoped_refptr<net::X509Certificate> test_ca_cert_;
   scoped_refptr<net::X509Certificate> test_server_cert_;
   net::CertificateList test_ca_cert_list_;
   net::NSSCertDatabase* cert_db_;
   scoped_ptr<PolicyCertVerifier> cert_verifier_;
 
  private:
   void OnTrustAnchorUsed() {
     trust_anchor_used_ = true;
@@ skipping 123 matching lines @@
     int error = VerifyTestServerCert(callback, &verify_result, &request_handle);
     // Note: this hits the cached result from the first Verify() in this test.
     EXPECT_EQ(net::ERR_CERT_AUTHORITY_INVALID, error);
   }
   // The additional trust anchors were reset, thus |cert_verifier_| should not
   // signal it's usage anymore.
   EXPECT_FALSE(WasTrustAnchorUsedAndReset());
 }
 
 }  // namespace policy