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

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

Issue 9015022: Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 8 years, 11 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/views/ssl_client_certificate_selector.h" 10 #include "chrome/browser/ui/views/ssl_client_certificate_selector.h"
11 #include "chrome/test/base/in_process_browser_test.h" 11 #include "chrome/test/base/in_process_browser_test.h"
12 #include "chrome/test/base/ui_test_utils.h" 12 #include "chrome/test/base/ui_test_utils.h"
13 #include "content/browser/tab_contents/tab_contents.h"
13 #include "content/browser/ssl/ssl_client_auth_handler_mock.h" 14 #include "content/browser/ssl/ssl_client_auth_handler_mock.h"
14 #include "net/base/cert_test_util.h" 15 #include "net/base/cert_test_util.h"
15 #include "net/base/x509_certificate.h" 16 #include "net/base/x509_certificate.h"
16 #include "net/url_request/url_request.h" 17 #include "net/url_request/url_request.h"
17 #include "net/url_request/url_request_context.h" 18 #include "net/url_request/url_request_context.h"
18 #include "net/url_request/url_request_context_getter.h" 19 #include "net/url_request/url_request_context_getter.h"
19 #include "testing/gmock/include/gmock/gmock.h" 20 #include "testing/gmock/include/gmock/gmock.h"
20 #include "testing/gtest/include/gtest/gtest.h" 21 #include "testing/gtest/include/gtest/gtest.h"
21 22
22 using ::testing::Mock; 23 using ::testing::Mock;
(...skipping 28 matching lines...) Expand all
51 52
52 virtual void SetUpOnMainThread() { 53 virtual void SetUpOnMainThread() {
53 url_request_context_getter_ = browser()->profile()->GetRequestContext(); 54 url_request_context_getter_ = browser()->profile()->GetRequestContext();
54 55
55 BrowserThread::PostTask( 56 BrowserThread::PostTask(
56 BrowserThread::IO, FROM_HERE, 57 BrowserThread::IO, FROM_HERE,
57 base::Bind(&SSLClientCertificateSelectorTest::SetUpOnIOThread, this)); 58 base::Bind(&SSLClientCertificateSelectorTest::SetUpOnIOThread, this));
58 59
59 io_loop_finished_event_.Wait(); 60 io_loop_finished_event_.Wait();
60 61
61 ui_test_utils::WaitForLoadStop(browser()->GetSelectedTabContents()); 62 ui_test_utils::WaitForLoadStop(browser()->GetSelectedWebContents());
62 selector_ = new SSLClientCertificateSelector( 63 selector_ = new SSLClientCertificateSelector(
63 browser()->GetSelectedTabContentsWrapper(), 64 browser()->GetSelectedTabContentsWrapper(),
64 cert_request_info_, 65 cert_request_info_,
65 auth_handler_); 66 auth_handler_);
66 selector_->Init(); 67 selector_->Init();
67 68
68 EXPECT_EQ(mit_davidben_cert_.get(), selector_->GetSelectedCert()); 69 EXPECT_EQ(mit_davidben_cert_.get(), selector_->GetSelectedCert());
69 } 70 }
70 71
71 virtual void SetUpOnIOThread() { 72 virtual void SetUpOnIOThread() {
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 EXPECT_TRUE(ui_test_utils::SendKeyPressSync( 355 EXPECT_TRUE(ui_test_utils::SendKeyPressSync(
355 browser_1_, ui::VKEY_RETURN, false, false, false, false)); 356 browser_1_, ui::VKEY_RETURN, false, false, false, false));
356 357
357 Mock::VerifyAndClear(auth_handler_); 358 Mock::VerifyAndClear(auth_handler_);
358 Mock::VerifyAndClear(auth_handler_1_); 359 Mock::VerifyAndClear(auth_handler_1_);
359 360
360 // Now let the default selection for auth_handler_ mock get checked on 361 // Now let the default selection for auth_handler_ mock get checked on
361 // destruction. 362 // destruction.
362 EXPECT_CALL(*auth_handler_, CertificateSelectedNoNotify(NULL)); 363 EXPECT_CALL(*auth_handler_, CertificateSelectedNoNotify(NULL));
363 } 364 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/html_dialog_view_browsertest.cc ('k') | chrome/browser/ui/views/tab_contents/tab_contents_container.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698