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

Side by Side Diff: chrome/browser/ssl/ssl_client_certificate_selector_test.cc

Issue 2021393004: Migrate WaitableEvent to enum-based constructor in chrome/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@WEvent_enums
Patch Set: Split out custom changes to thread_watcher_unittest.cc 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/ssl/ssl_client_certificate_selector_test.h" 5 #include "chrome/browser/ssl/ssl_client_certificate_selector_test.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
11 #include "chrome/browser/ui/tabs/tab_strip_model.h" 11 #include "chrome/browser/ui/tabs/tab_strip_model.h"
12 #include "content/public/browser/browser_thread.h" 12 #include "content/public/browser/browser_thread.h"
13 #include "content/public/browser/web_contents.h" 13 #include "content/public/browser/web_contents.h"
14 #include "content/public/test/browser_test_utils.h" 14 #include "content/public/test/browser_test_utils.h"
15 #include "net/base/request_priority.h" 15 #include "net/base/request_priority.h"
16 #include "net/base/test_data_directory.h" 16 #include "net/base/test_data_directory.h"
17 #include "net/cert/x509_certificate.h" 17 #include "net/cert/x509_certificate.h"
18 #include "net/http/http_transaction_factory.h" 18 #include "net/http/http_transaction_factory.h"
19 #include "net/ssl/ssl_cert_request_info.h" 19 #include "net/ssl/ssl_cert_request_info.h"
20 #include "net/test/cert_test_util.h" 20 #include "net/test/cert_test_util.h"
21 #include "net/url_request/url_request.h" 21 #include "net/url_request/url_request.h"
22 #include "net/url_request/url_request_context.h" 22 #include "net/url_request/url_request_context.h"
23 #include "net/url_request/url_request_context_getter.h" 23 #include "net/url_request/url_request_context_getter.h"
24 24
25 using ::testing::Mock; 25 using ::testing::Mock;
26 using ::testing::StrictMock; 26 using ::testing::StrictMock;
27 using content::BrowserThread; 27 using content::BrowserThread;
28 28
29 SSLClientCertificateSelectorTestBase::SSLClientCertificateSelectorTestBase() 29 SSLClientCertificateSelectorTestBase::SSLClientCertificateSelectorTestBase()
30 : io_loop_finished_event_(false, false) { 30 : io_loop_finished_event_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
31 base::WaitableEvent::InitialState::NOT_SIGNALED) {
31 } 32 }
32 33
33 SSLClientCertificateSelectorTestBase::~SSLClientCertificateSelectorTestBase() { 34 SSLClientCertificateSelectorTestBase::~SSLClientCertificateSelectorTestBase() {
34 } 35 }
35 36
36 void SSLClientCertificateSelectorTestBase::SetUpInProcessBrowserTestFixture() { 37 void SSLClientCertificateSelectorTestBase::SetUpInProcessBrowserTestFixture() {
37 base::FilePath certs_dir = net::GetTestCertsDirectory(); 38 base::FilePath certs_dir = net::GetTestCertsDirectory();
38 39
39 mit_davidben_cert_ = net::ImportCertFromFile(certs_dir, "mit.davidben.der"); 40 mit_davidben_cert_ = net::ImportCertFromFile(certs_dir, "mit.davidben.der");
40 ASSERT_TRUE(mit_davidben_cert_.get()); 41 ASSERT_TRUE(mit_davidben_cert_.get());
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 } 95 }
95 96
96 std::unique_ptr<net::URLRequest> 97 std::unique_ptr<net::URLRequest>
97 SSLClientCertificateSelectorTestBase::MakeURLRequest( 98 SSLClientCertificateSelectorTestBase::MakeURLRequest(
98 net::URLRequestContextGetter* context_getter) { 99 net::URLRequestContextGetter* context_getter) {
99 std::unique_ptr<net::URLRequest> request = 100 std::unique_ptr<net::URLRequest> request =
100 context_getter->GetURLRequestContext()->CreateRequest( 101 context_getter->GetURLRequestContext()->CreateRequest(
101 GURL("https://example"), net::DEFAULT_PRIORITY, NULL); 102 GURL("https://example"), net::DEFAULT_PRIORITY, NULL);
102 return request; 103 return request;
103 } 104 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698