Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(644)

Side by Side Diff: chrome/browser/chromeos/policy/policy_cert_verifier_browsertest.cc

Issue 1118773004: [chrome/browser/chromeos/policy] Replace MessageLoopProxy usage with ThreadTaskRunnerHandle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed Review Comments->2 Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/policy/policy_cert_verifier.h" 5 #include "chrome/browser/chromeos/policy/policy_cert_verifier.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/run_loop.h" 12 #include "base/run_loop.h"
13 #include "base/thread_task_runner_handle.h"
13 #include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h" 14 #include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h"
14 #include "content/public/browser/browser_thread.h" 15 #include "content/public/browser/browser_thread.h"
15 #include "content/public/test/test_browser_thread_bundle.h" 16 #include "content/public/test/test_browser_thread_bundle.h"
16 #include "crypto/nss_util_internal.h" 17 #include "crypto/nss_util_internal.h"
17 #include "crypto/scoped_test_nss_chromeos_user.h" 18 #include "crypto/scoped_test_nss_chromeos_user.h"
18 #include "net/base/test_completion_callback.h" 19 #include "net/base/test_completion_callback.h"
19 #include "net/base/test_data_directory.h" 20 #include "net/base/test_data_directory.h"
20 #include "net/cert/cert_trust_anchor_provider.h" 21 #include "net/cert/cert_trust_anchor_provider.h"
21 #include "net/cert/cert_verify_result.h" 22 #include "net/cert/cert_verify_result.h"
22 #include "net/cert/nss_cert_database_chromeos.h" 23 #include "net/cert/nss_cert_database_chromeos.h"
(...skipping 13 matching lines...) Expand all
36 37
37 void SetUp() override { 38 void SetUp() override {
38 ASSERT_TRUE(test_nss_user_.constructed_successfully()); 39 ASSERT_TRUE(test_nss_user_.constructed_successfully());
39 test_nss_user_.FinishInit(); 40 test_nss_user_.FinishInit();
40 41
41 test_cert_db_.reset(new net::NSSCertDatabaseChromeOS( 42 test_cert_db_.reset(new net::NSSCertDatabaseChromeOS(
42 crypto::GetPublicSlotForChromeOSUser(test_nss_user_.username_hash()), 43 crypto::GetPublicSlotForChromeOSUser(test_nss_user_.username_hash()),
43 crypto::GetPrivateSlotForChromeOSUser( 44 crypto::GetPrivateSlotForChromeOSUser(
44 test_nss_user_.username_hash(), 45 test_nss_user_.username_hash(),
45 base::Callback<void(crypto::ScopedPK11Slot)>()))); 46 base::Callback<void(crypto::ScopedPK11Slot)>())));
46 test_cert_db_->SetSlowTaskRunnerForTest(base::MessageLoopProxy::current()); 47 test_cert_db_->SetSlowTaskRunnerForTest(
48 base::ThreadTaskRunnerHandle::Get());
47 49
48 cert_verifier_.reset(new PolicyCertVerifier(base::Bind( 50 cert_verifier_.reset(new PolicyCertVerifier(base::Bind(
49 &PolicyCertVerifierTest::OnTrustAnchorUsed, base::Unretained(this)))); 51 &PolicyCertVerifierTest::OnTrustAnchorUsed, base::Unretained(this))));
50 cert_verifier_->InitializeOnIOThread(new chromeos::CertVerifyProcChromeOS( 52 cert_verifier_->InitializeOnIOThread(new chromeos::CertVerifyProcChromeOS(
51 crypto::GetPublicSlotForChromeOSUser(test_nss_user_.username_hash()))); 53 crypto::GetPublicSlotForChromeOSUser(test_nss_user_.username_hash())));
52 54
53 test_ca_cert_ = LoadCertificate("root_ca_cert.pem", net::CA_CERT); 55 test_ca_cert_ = LoadCertificate("root_ca_cert.pem", net::CA_CERT);
54 ASSERT_TRUE(test_ca_cert_.get()); 56 ASSERT_TRUE(test_ca_cert_.get());
55 test_server_cert_ = LoadCertificate("ok_cert.pem", net::SERVER_CERT); 57 test_server_cert_ = LoadCertificate("ok_cert.pem", net::SERVER_CERT);
56 ASSERT_TRUE(test_server_cert_.get()); 58 ASSERT_TRUE(test_server_cert_.get());
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 int error = VerifyTestServerCert(callback, &verify_result, &request_handle); 224 int error = VerifyTestServerCert(callback, &verify_result, &request_handle);
223 // Note: this hits the cached result from the first Verify() in this test. 225 // Note: this hits the cached result from the first Verify() in this test.
224 EXPECT_EQ(net::ERR_CERT_AUTHORITY_INVALID, error); 226 EXPECT_EQ(net::ERR_CERT_AUTHORITY_INVALID, error);
225 } 227 }
226 // The additional trust anchors were reset, thus |cert_verifier_| should not 228 // The additional trust anchors were reset, thus |cert_verifier_| should not
227 // signal it's usage anymore. 229 // signal it's usage anymore.
228 EXPECT_FALSE(WasTrustAnchorUsedAndReset()); 230 EXPECT_FALSE(WasTrustAnchorUsedAndReset());
229 } 231 }
230 232
231 } // namespace policy 233 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698