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

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

Issue 51953002: [Net] Add a priority parameter to URLRequest's constructor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compile error from rebase Created 7 years, 1 month 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 | Annotate | Revision Log
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/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"
11 #include "chrome/browser/ui/tabs/tab_strip_model.h" 11 #include "chrome/browser/ui/tabs/tab_strip_model.h"
12 #include "chrome/browser/ui/views/ssl_client_certificate_selector.h" 12 #include "chrome/browser/ui/views/ssl_client_certificate_selector.h"
13 #include "chrome/test/base/in_process_browser_test.h" 13 #include "chrome/test/base/in_process_browser_test.h"
14 #include "chrome/test/base/interactive_test_utils.h" 14 #include "chrome/test/base/interactive_test_utils.h"
15 #include "chrome/test/base/ui_test_utils.h" 15 #include "chrome/test/base/ui_test_utils.h"
16 #include "content/public/browser/web_contents.h" 16 #include "content/public/browser/web_contents.h"
17 #include "content/public/test/browser_test_utils.h" 17 #include "content/public/test/browser_test_utils.h"
18 #include "net/base/request_priority.h"
18 #include "net/base/test_data_directory.h" 19 #include "net/base/test_data_directory.h"
19 #include "net/cert/x509_certificate.h" 20 #include "net/cert/x509_certificate.h"
20 #include "net/http/http_transaction_factory.h" 21 #include "net/http/http_transaction_factory.h"
21 #include "net/ssl/ssl_cert_request_info.h" 22 #include "net/ssl/ssl_cert_request_info.h"
22 #include "net/test/cert_test_util.h" 23 #include "net/test/cert_test_util.h"
23 #include "net/url_request/url_request.h" 24 #include "net/url_request/url_request.h"
24 #include "net/url_request/url_request_context.h" 25 #include "net/url_request/url_request_context.h"
25 #include "net/url_request/url_request_context_getter.h" 26 #include "net/url_request/url_request_context_getter.h"
26 #include "testing/gtest/include/gtest/gtest.h" 27 #include "testing/gtest/include/gtest/gtest.h"
27 28
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 delete url_request_; 107 delete url_request_;
107 108
108 io_loop_finished_event_.Signal(); 109 io_loop_finished_event_.Signal();
109 } 110 }
110 111
111 protected: 112 protected:
112 net::URLRequest* MakeURLRequest( 113 net::URLRequest* MakeURLRequest(
113 net::URLRequestContextGetter* context_getter) { 114 net::URLRequestContextGetter* context_getter) {
114 net::URLRequest* request = 115 net::URLRequest* request =
115 context_getter->GetURLRequestContext()->CreateRequest( 116 context_getter->GetURLRequestContext()->CreateRequest(
116 GURL("https://example"), NULL); 117 GURL("https://example"), net::DEFAULT_PRIORITY, NULL);
117 return request; 118 return request;
118 } 119 }
119 120
120 base::WaitableEvent io_loop_finished_event_; 121 base::WaitableEvent io_loop_finished_event_;
121 122
122 scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_; 123 scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
123 net::URLRequest* url_request_; 124 net::URLRequest* url_request_;
124 125
125 scoped_refptr<net::X509Certificate> mit_davidben_cert_; 126 scoped_refptr<net::X509Certificate> mit_davidben_cert_;
126 scoped_refptr<net::X509Certificate> foaf_me_chromium_test_cert_; 127 scoped_refptr<net::X509Certificate> foaf_me_chromium_test_cert_;
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 EXPECT_TRUE(ui_test_utils::SendKeyPressSync( 379 EXPECT_TRUE(ui_test_utils::SendKeyPressSync(
379 browser_1_, ui::VKEY_RETURN, false, false, false, false)); 380 browser_1_, ui::VKEY_RETURN, false, false, false, false));
380 381
381 Mock::VerifyAndClear(auth_requestor_.get()); 382 Mock::VerifyAndClear(auth_requestor_.get());
382 Mock::VerifyAndClear(auth_requestor_1_.get()); 383 Mock::VerifyAndClear(auth_requestor_1_.get());
383 384
384 // Now let the default selection for auth_requestor_ mock get checked on 385 // Now let the default selection for auth_requestor_ mock get checked on
385 // destruction. 386 // destruction.
386 EXPECT_CALL(*auth_requestor_, CertificateSelected(NULL)); 387 EXPECT_CALL(*auth_requestor_, CertificateSelected(NULL));
387 } 388 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698