| 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 "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/browser/ssl/ssl_client_auth_requestor_mock.h" | 10 #include "chrome/browser/ssl/ssl_client_auth_requestor_mock.h" |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 auth_requestor_ = NULL; | 117 auth_requestor_ = NULL; |
| 118 } | 118 } |
| 119 | 119 |
| 120 virtual void CleanUpOnIOThread() { | 120 virtual void CleanUpOnIOThread() { |
| 121 delete url_request_; | 121 delete url_request_; |
| 122 | 122 |
| 123 io_loop_finished_event_.Signal(); | 123 io_loop_finished_event_.Signal(); |
| 124 } | 124 } |
| 125 | 125 |
| 126 protected: | 126 protected: |
| 127 scoped_ptr<net::URLRequest> MakeURLRequest( | 127 std::unique_ptr<net::URLRequest> MakeURLRequest( |
| 128 net::URLRequestContextGetter* context_getter) { | 128 net::URLRequestContextGetter* context_getter) { |
| 129 return context_getter->GetURLRequestContext()->CreateRequest( | 129 return context_getter->GetURLRequestContext()->CreateRequest( |
| 130 GURL("https://example"), net::DEFAULT_PRIORITY, NULL); | 130 GURL("https://example"), net::DEFAULT_PRIORITY, NULL); |
| 131 } | 131 } |
| 132 | 132 |
| 133 base::WaitableEvent io_loop_finished_event_; | 133 base::WaitableEvent io_loop_finished_event_; |
| 134 | 134 |
| 135 scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_; | 135 scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_; |
| 136 net::URLRequest* url_request_; | 136 net::URLRequest* url_request_; |
| 137 | 137 |
| (...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 393 EXPECT_TRUE(ui_test_utils::SendKeyPressSync( | 393 EXPECT_TRUE(ui_test_utils::SendKeyPressSync( |
| 394 browser_1_, ui::VKEY_RETURN, false, false, false, false)); | 394 browser_1_, ui::VKEY_RETURN, false, false, false, false)); |
| 395 | 395 |
| 396 Mock::VerifyAndClear(auth_requestor_.get()); | 396 Mock::VerifyAndClear(auth_requestor_.get()); |
| 397 Mock::VerifyAndClear(auth_requestor_1_.get()); | 397 Mock::VerifyAndClear(auth_requestor_1_.get()); |
| 398 | 398 |
| 399 // Now let the default selection for auth_requestor_ mock get checked on | 399 // Now let the default selection for auth_requestor_ mock get checked on |
| 400 // destruction. | 400 // destruction. |
| 401 EXPECT_CALL(*auth_requestor_.get(), CancelCertificateSelection()); | 401 EXPECT_CALL(*auth_requestor_.get(), CancelCertificateSelection()); |
| 402 } | 402 } |
| OLD | NEW |