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

Side by Side Diff: chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc

Issue 10910044: Removed calls to URLRequest::URLRequest in favor of URLRequestContext::CreateRequest (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 3 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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/file_path.h" 6 #include "base/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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 98
99 virtual void CleanUpOnIOThread() { 99 virtual void CleanUpOnIOThread() {
100 delete url_request_; 100 delete url_request_;
101 101
102 io_loop_finished_event_.Signal(); 102 io_loop_finished_event_.Signal();
103 } 103 }
104 104
105 protected: 105 protected:
106 net::URLRequest* MakeURLRequest( 106 net::URLRequest* MakeURLRequest(
107 net::URLRequestContextGetter* context_getter) { 107 net::URLRequestContextGetter* context_getter) {
108 net::URLRequest* request = new net::URLRequest( 108 net::URLRequest* request =
109 GURL("https://example"), 109 context_getter->GetURLRequestContext()->CreateRequest(
110 NULL, 110 GURL("https://example"), NULL);
111 context_getter->GetURLRequestContext());
112 return request; 111 return request;
113 } 112 }
114 113
115 base::WaitableEvent io_loop_finished_event_; 114 base::WaitableEvent io_loop_finished_event_;
116 115
117 scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_; 116 scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
118 net::URLRequest* url_request_; 117 net::URLRequest* url_request_;
119 118
120 scoped_refptr<net::X509Certificate> mit_davidben_cert_; 119 scoped_refptr<net::X509Certificate> mit_davidben_cert_;
121 scoped_refptr<net::X509Certificate> foaf_me_chromium_test_cert_; 120 scoped_refptr<net::X509Certificate> foaf_me_chromium_test_cert_;
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 EXPECT_TRUE(ui_test_utils::SendKeyPressSync( 370 EXPECT_TRUE(ui_test_utils::SendKeyPressSync(
372 browser_1_, ui::VKEY_RETURN, false, false, false, false)); 371 browser_1_, ui::VKEY_RETURN, false, false, false, false));
373 372
374 Mock::VerifyAndClear(auth_requestor_.get()); 373 Mock::VerifyAndClear(auth_requestor_.get());
375 Mock::VerifyAndClear(auth_requestor_1_.get()); 374 Mock::VerifyAndClear(auth_requestor_1_.get());
376 375
377 // Now let the default selection for auth_requestor_ mock get checked on 376 // Now let the default selection for auth_requestor_ mock get checked on
378 // destruction. 377 // destruction.
379 EXPECT_CALL(*auth_requestor_, CertificateSelected(NULL)); 378 EXPECT_CALL(*auth_requestor_, CertificateSelected(NULL));
380 } 379 }
OLDNEW
« no previous file with comments | « chrome/browser/plugin_installer.cc ('k') | content/browser/debugger/devtools_http_handler_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698