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

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

Issue 2090463002: Move net/base/test_data_directory.[cc,h] to net/test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 <memory> 7 #include <memory>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "base/run_loop.h" 13 #include "base/run_loop.h"
14 #include "base/threading/thread_task_runner_handle.h" 14 #include "base/threading/thread_task_runner_handle.h"
15 #include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h" 15 #include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h"
16 #include "content/public/browser/browser_thread.h" 16 #include "content/public/browser/browser_thread.h"
17 #include "content/public/test/test_browser_thread_bundle.h" 17 #include "content/public/test/test_browser_thread_bundle.h"
18 #include "crypto/nss_util_internal.h" 18 #include "crypto/nss_util_internal.h"
19 #include "crypto/scoped_test_nss_chromeos_user.h" 19 #include "crypto/scoped_test_nss_chromeos_user.h"
20 #include "net/base/test_completion_callback.h" 20 #include "net/base/test_completion_callback.h"
21 #include "net/base/test_data_directory.h"
22 #include "net/cert/cert_verify_result.h" 21 #include "net/cert/cert_verify_result.h"
23 #include "net/cert/nss_cert_database_chromeos.h" 22 #include "net/cert/nss_cert_database_chromeos.h"
24 #include "net/cert/x509_certificate.h" 23 #include "net/cert/x509_certificate.h"
25 #include "net/log/net_log.h" 24 #include "net/log/net_log.h"
26 #include "net/test/cert_test_util.h" 25 #include "net/test/cert_test_util.h"
26 #include "net/test/test_data_directory.h"
27 #include "testing/gtest/include/gtest/gtest.h" 27 #include "testing/gtest/include/gtest/gtest.h"
28 28
29 namespace policy { 29 namespace policy {
30 30
31 class PolicyCertVerifierTest : public testing::Test { 31 class PolicyCertVerifierTest : public testing::Test {
32 public: 32 public:
33 PolicyCertVerifierTest() 33 PolicyCertVerifierTest()
34 : trust_anchor_used_(false), test_nss_user_("user1") {} 34 : trust_anchor_used_(false), test_nss_user_("user1") {}
35 35
36 ~PolicyCertVerifierTest() override {} 36 ~PolicyCertVerifierTest() override {}
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 int error = VerifyTestServerCert(callback, &verify_result, &request); 227 int error = VerifyTestServerCert(callback, &verify_result, &request);
228 // Note: this hits the cached result from the first Verify() in this test. 228 // Note: this hits the cached result from the first Verify() in this test.
229 EXPECT_EQ(net::ERR_CERT_AUTHORITY_INVALID, error); 229 EXPECT_EQ(net::ERR_CERT_AUTHORITY_INVALID, error);
230 } 230 }
231 // The additional trust anchors were reset, thus |cert_verifier_| should not 231 // The additional trust anchors were reset, thus |cert_verifier_| should not
232 // signal it's usage anymore. 232 // signal it's usage anymore.
233 EXPECT_FALSE(WasTrustAnchorUsedAndReset()); 233 EXPECT_FALSE(WasTrustAnchorUsedAndReset());
234 } 234 }
235 235
236 } // namespace policy 236 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698