OLD | NEW |
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 "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/files/file_path.h" | 6 #include "base/files/file_path.h" |
7 #include "base/synchronization/waitable_event.h" | 7 #include "base/synchronization/waitable_event.h" |
8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
9 #include "chrome/browser/ssl/ssl_client_auth_requestor_mock.h" | 9 #include "chrome/browser/ssl/ssl_client_auth_requestor_mock.h" |
10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
106 virtual void CleanUpOnIOThread() { | 106 virtual void CleanUpOnIOThread() { |
107 delete url_request_; | 107 delete url_request_; |
108 | 108 |
109 io_loop_finished_event_.Signal(); | 109 io_loop_finished_event_.Signal(); |
110 } | 110 } |
111 | 111 |
112 protected: | 112 protected: |
113 scoped_ptr<net::URLRequest> MakeURLRequest( | 113 scoped_ptr<net::URLRequest> MakeURLRequest( |
114 net::URLRequestContextGetter* context_getter) { | 114 net::URLRequestContextGetter* context_getter) { |
115 return context_getter->GetURLRequestContext()->CreateRequest( | 115 return context_getter->GetURLRequestContext()->CreateRequest( |
116 GURL("https://example"), net::DEFAULT_PRIORITY, NULL); | 116 GURL("https://example"), net::DEFAULT_PRIORITY, NULL, NULL); |
117 } | 117 } |
118 | 118 |
119 base::WaitableEvent io_loop_finished_event_; | 119 base::WaitableEvent io_loop_finished_event_; |
120 | 120 |
121 scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_; | 121 scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_; |
122 net::URLRequest* url_request_; | 122 net::URLRequest* url_request_; |
123 | 123 |
124 scoped_refptr<net::X509Certificate> mit_davidben_cert_; | 124 scoped_refptr<net::X509Certificate> mit_davidben_cert_; |
125 scoped_refptr<net::X509Certificate> foaf_me_chromium_test_cert_; | 125 scoped_refptr<net::X509Certificate> foaf_me_chromium_test_cert_; |
126 scoped_refptr<net::SSLCertRequestInfo> cert_request_info_; | 126 scoped_refptr<net::SSLCertRequestInfo> cert_request_info_; |
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
385 EXPECT_TRUE(ui_test_utils::SendKeyPressSync( | 385 EXPECT_TRUE(ui_test_utils::SendKeyPressSync( |
386 browser_1_, ui::VKEY_RETURN, false, false, false, false)); | 386 browser_1_, ui::VKEY_RETURN, false, false, false, false)); |
387 | 387 |
388 Mock::VerifyAndClear(auth_requestor_.get()); | 388 Mock::VerifyAndClear(auth_requestor_.get()); |
389 Mock::VerifyAndClear(auth_requestor_1_.get()); | 389 Mock::VerifyAndClear(auth_requestor_1_.get()); |
390 | 390 |
391 // Now let the default selection for auth_requestor_ mock get checked on | 391 // Now let the default selection for auth_requestor_ mock get checked on |
392 // destruction. | 392 // destruction. |
393 EXPECT_CALL(*auth_requestor_, CertificateSelected(NULL)); | 393 EXPECT_CALL(*auth_requestor_, CertificateSelected(NULL)); |
394 } | 394 } |
OLD | NEW |