summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/ssl/ssl_add_cert_handler.cc16
-rw-r--r--chrome/browser/ssl/ssl_browser_tests.cc93
2 files changed, 53 insertions, 56 deletions
diff --git a/chrome/browser/ssl/ssl_add_cert_handler.cc b/chrome/browser/ssl/ssl_add_cert_handler.cc
index 740088f..4cae2d4 100644
--- a/chrome/browser/ssl/ssl_add_cert_handler.cc
+++ b/chrome/browser/ssl/ssl_add_cert_handler.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "chrome/browser/tab_contents/tab_contents_ssl_helper.h"
#include "chrome/browser/tab_contents/tab_util.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/resource_request_info.h"
#include "content/public/browser/web_contents.h"
@@ -94,9 +94,8 @@ void SSLAddCertHandler::CallVerifyClientCertificateError(int cert_error) {
if (!tab)
return;
- TabContentsWrapper* wrapper =
- TabContentsWrapper::GetCurrentWrapperForContents(tab);
- wrapper->ssl_helper()->OnVerifyClientCertificateError(this, cert_error);
+ TabContents* tab_contents = TabContents::FromWebContents(tab);
+ tab_contents->ssl_helper()->OnVerifyClientCertificateError(this, cert_error);
}
void SSLAddCertHandler::CallAddClientCertificate(bool add_cert,
@@ -106,14 +105,13 @@ void SSLAddCertHandler::CallAddClientCertificate(bool add_cert,
if (!tab)
return;
- TabContentsWrapper* wrapper =
- TabContentsWrapper::GetCurrentWrapperForContents(tab);
+ TabContents* tab_contents = TabContents::FromWebContents(tab);
if (add_cert) {
if (cert_error == net::OK) {
- wrapper->ssl_helper()->OnAddClientCertificateSuccess(this);
+ tab_contents->ssl_helper()->OnAddClientCertificateSuccess(this);
} else {
- wrapper->ssl_helper()->OnAddClientCertificateError(this, cert_error);
+ tab_contents->ssl_helper()->OnAddClientCertificateError(this, cert_error);
}
}
- wrapper->ssl_helper()->OnAddClientCertificateFinished(this);
+ tab_contents->ssl_helper()->OnAddClientCertificateFinished(this);
}
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
index a80fa38..d0c3592 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -12,7 +12,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_navigator.h"
#include "chrome/browser/ui/constrained_window_tab_helper.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_paths.h"
@@ -198,8 +198,7 @@ class SSLUITest : public InProcessBrowserTest {
}
int GetConstrainedWindowCount() const {
- return static_cast<int>(
- browser()->GetSelectedTabContentsWrapper()->
+ return static_cast<int>(browser()->GetActiveTabContents()->
constrained_window_tab_helper()->constrained_window_count());
}
@@ -303,7 +302,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTP) {
ui_test_utils::NavigateToURL(browser(),
test_server()->GetURL("files/ssl/google.html"));
- CheckUnauthenticatedState(browser()->GetSelectedWebContents());
+ CheckUnauthenticatedState(browser()->GetActiveWebContents());
}
// Visits a page over http which includes broken https resources (status should
@@ -323,7 +322,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPWithBrokenHTTPSResource) {
ui_test_utils::NavigateToURL(
browser(), test_server()->GetURL(replacement_path));
- CheckUnauthenticatedState(browser()->GetSelectedWebContents());
+ CheckUnauthenticatedState(browser()->GetActiveWebContents());
}
// http://crbug.com/91745
@@ -340,7 +339,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestOKHTTPS) {
ui_test_utils::NavigateToURL(browser(),
https_server_.GetURL("files/ssl/google.html"));
- CheckAuthenticatedState(browser()->GetSelectedWebContents(), false);
+ CheckAuthenticatedState(browser()->GetActiveWebContents(), false);
}
// Visits a page with https error and proceed:
@@ -350,7 +349,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSExpiredCertAndProceed) {
ui_test_utils::NavigateToURL(browser(),
https_server_expired_.GetURL("files/ssl/google.html"));
- WebContents* tab = browser()->GetSelectedWebContents();
+ WebContents* tab = browser()->GetActiveWebContents();
CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, false,
true); // Interstitial showing
@@ -371,7 +370,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSExpiredCertAndDontProceed) {
ui_test_utils::NavigateToURL(browser(),
https_server_.GetURL("files/ssl/google.html"));
- WebContents* tab = browser()->GetSelectedWebContents();
+ WebContents* tab = browser()->GetActiveWebContents();
NavigationEntry* entry = tab->GetController().GetActiveEntry();
ASSERT_TRUE(entry);
@@ -415,7 +414,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest,
// First navigate to an HTTP page.
ui_test_utils::NavigateToURL(browser(),
test_server()->GetURL("files/ssl/google.html"));
- WebContents* tab = browser()->GetSelectedWebContents();
+ WebContents* tab = browser()->GetActiveWebContents();
NavigationEntry* entry = tab->GetController().GetActiveEntry();
ASSERT_TRUE(entry);
@@ -437,7 +436,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest,
tab->GetRenderViewHost()));
// We should be back at the original good page.
- EXPECT_FALSE(browser()->GetSelectedWebContents()->GetInterstitialPage());
+ EXPECT_FALSE(browser()->GetActiveWebContents()->GetInterstitialPage());
CheckUnauthenticatedState(tab);
}
@@ -451,7 +450,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest,
// First navigate to an HTTP page.
ui_test_utils::NavigateToURL(browser(),
test_server()->GetURL("files/ssl/google.html"));
- WebContents* tab = browser()->GetSelectedWebContents();
+ WebContents* tab = browser()->GetActiveWebContents();
NavigationEntry* entry = tab->GetController().GetActiveEntry();
ASSERT_TRUE(entry);
@@ -465,7 +464,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest,
tab->GetController().GoToOffset(-1);
// We should be back at the original good page.
- EXPECT_FALSE(browser()->GetSelectedWebContents()->GetInterstitialPage());
+ EXPECT_FALSE(browser()->GetActiveWebContents()->GetInterstitialPage());
CheckUnauthenticatedState(tab);
}
@@ -477,7 +476,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSExpiredCertAndGoForward) {
// First navigate to two HTTP pages.
ui_test_utils::NavigateToURL(browser(),
test_server()->GetURL("files/ssl/google.html"));
- WebContents* tab = browser()->GetSelectedWebContents();
+ WebContents* tab = browser()->GetActiveWebContents();
NavigationEntry* entry1 = tab->GetController().GetActiveEntry();
ASSERT_TRUE(entry1);
ui_test_utils::NavigateToURL(browser(),
@@ -513,7 +512,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSExpiredCertAndGoForward) {
}
// We should be showing the second good page.
- EXPECT_FALSE(browser()->GetSelectedWebContents()->GetInterstitialPage());
+ EXPECT_FALSE(browser()->GetActiveWebContents()->GetInterstitialPage());
CheckUnauthenticatedState(tab);
EXPECT_FALSE(tab->GetController().CanGoForward());
NavigationEntry* entry4 = tab->GetController().GetActiveEntry();
@@ -528,7 +527,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestWSSInvalidCertAndClose) {
ASSERT_TRUE(https_server_expired_.Start());
// Setup page title observer.
- WebContents* tab = browser()->GetSelectedWebContents();
+ WebContents* tab = browser()->GetActiveWebContents();
ui_test_utils::TitleWatcher watcher(tab, ASCIIToUTF16("PASS"));
watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));
@@ -543,7 +542,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestWSSInvalidCertAndClose) {
GURL slaveUrl(slaveUrlPath);
// Create tabs and visit pages which keep on creating wss connections.
- TabContentsWrapper* tabs[16];
+ TabContents* tabs[16];
for (int i = 0; i < 16; ++i) {
tabs[i] = browser()->AddSelectedTabWithURL(
slaveUrl, content::PAGE_TRANSITION_LINK);
@@ -578,7 +577,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestWSSInvalidCertAndGoForward) {
ASSERT_TRUE(wss_server.Start(wss_root_dir));
// Setup page title observer.
- WebContents* tab = browser()->GetSelectedWebContents();
+ WebContents* tab = browser()->GetActiveWebContents();
ui_test_utils::TitleWatcher watcher(tab, ASCIIToUTF16("PASS"));
watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));
@@ -614,7 +613,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestHTTPSErrorWithNoNavEntry) {
ASSERT_TRUE(https_server_expired_.Start());
GURL url = https_server_expired_.GetURL("files/ssl/google.htm");
- TabContentsWrapper* tab2 =
+ TabContents* tab2 =
browser()->AddSelectedTabWithURL(url, content::PAGE_TRANSITION_TYPED);
ui_test_utils::WaitForLoadStop(tab2->web_contents());
@@ -650,7 +649,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestBadHTTPSDownload) {
// Proceed through the SSL interstitial. This doesn't use
// |ProceedThroughInterstitial| since no page load will commit.
- WebContents* tab = browser()->GetSelectedWebContents();
+ WebContents* tab = browser()->GetActiveWebContents();
ASSERT_TRUE(tab != NULL);
ASSERT_TRUE(tab->GetInterstitialPage() != NULL);
{
@@ -689,7 +688,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestDisplaysInsecureContent) {
ui_test_utils::NavigateToURL(browser(),
https_server_.GetURL(replacement_path));
- CheckAuthenticatedState(browser()->GetSelectedWebContents(), true);
+ CheckAuthenticatedState(browser()->GetActiveWebContents(), true);
}
// Visits a page that runs insecure content and tries to suppress the insecure
@@ -703,7 +702,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest,
ui_test_utils::NavigateToURL(browser(), https_server_.GetURL(
"files/ssl/page_runs_insecure_content.html"));
- CheckAuthenticationBrokenState(browser()->GetSelectedWebContents(), 0, true,
+ CheckAuthenticationBrokenState(browser()->GetActiveWebContents(), 0, true,
false);
}
@@ -722,7 +721,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestUnsafeContents) {
ui_test_utils::NavigateToURL(browser(),
https_server_.GetURL(replacement_path));
- WebContents* tab = browser()->GetSelectedWebContents();
+ WebContents* tab = browser()->GetActiveWebContents();
// When the bad content is filtered, the state is expected to be
// authenticated.
CheckAuthenticatedState(tab, false);
@@ -764,7 +763,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestDisplaysInsecureContentLoadedFromJS) {
ui_test_utils::NavigateToURL(browser(), https_server_.GetURL(
replacement_path));
- WebContents* tab = browser()->GetSelectedWebContents();
+ WebContents* tab = browser()->GetActiveWebContents();
CheckAuthenticatedState(tab, false);
// Load the insecure image.
@@ -788,7 +787,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestDisplaysInsecureContentTwoTabs) {
ui_test_utils::NavigateToURL(browser(),
https_server_.GetURL("files/ssl/blank_page.html"));
- TabContentsWrapper* tab1 = browser()->GetSelectedTabContentsWrapper();
+ TabContents* tab1 = browser()->GetActiveTabContents();
// This tab should be fine.
CheckAuthenticatedState(tab1->web_contents(), false);
@@ -810,7 +809,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestDisplaysInsecureContentTwoTabs) {
content::NOTIFICATION_LOAD_STOP,
content::NotificationService::AllSources());
browser::Navigate(&params);
- TabContentsWrapper* tab2 = params.target_contents;
+ TabContents* tab2 = params.target_contents;
observer.Wait();
// The new tab has insecure content.
@@ -830,7 +829,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestRunsInsecureContentTwoTabs) {
ui_test_utils::NavigateToURL(browser(),
https_server_.GetURL("files/ssl/blank_page.html"));
- TabContentsWrapper* tab1 = browser()->GetSelectedTabContentsWrapper();
+ TabContents* tab1 = browser()->GetActiveTabContents();
// This tab should be fine.
CheckAuthenticatedState(tab1->web_contents(), false);
@@ -851,7 +850,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestRunsInsecureContentTwoTabs) {
content::NOTIFICATION_LOAD_STOP,
content::NotificationService::AllSources());
browser::Navigate(&params);
- TabContentsWrapper* tab2 = params.target_contents;
+ TabContents* tab2 = params.target_contents;
observer.Wait();
// The new tab has insecure content.
@@ -878,7 +877,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestDisplaysCachedInsecureContent) {
// Load original page over HTTP.
const GURL url_http = test_server()->GetURL(replacement_path);
ui_test_utils::NavigateToURL(browser(), url_http);
- WebContents* tab = browser()->GetSelectedWebContents();
+ WebContents* tab = browser()->GetActiveWebContents();
CheckUnauthenticatedState(tab);
// Load again but over SSL. It should be marked as displaying insecure
@@ -912,7 +911,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestRunsCachedInsecureContent) {
// Load original page over HTTP.
const GURL url_http = test_server()->GetURL(replacement_path);
ui_test_utils::NavigateToURL(browser(), url_http);
- WebContents* tab = browser()->GetSelectedWebContents();
+ WebContents* tab = browser()->GetActiveWebContents();
CheckUnauthenticatedState(tab);
// Load again but over SSL. It should be marked as displaying insecure
@@ -934,7 +933,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestCNInvalidStickiness) {
https_server_mismatched_.GetURL("files/ssl/google.html"));
// We get an interstitial page as a result.
- WebContents* tab = browser()->GetSelectedWebContents();
+ WebContents* tab = browser()->GetActiveWebContents();
CheckAuthenticationBrokenState(tab, net::CERT_STATUS_COMMON_NAME_INVALID,
false, true); // Interstitial showing.
ProceedThroughInterstitial(tab);
@@ -972,7 +971,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestRefNavigation) {
ui_test_utils::NavigateToURL(browser(),
https_server_expired_.GetURL("files/ssl/page_with_refs.html"));
- WebContents* tab = browser()->GetSelectedWebContents();
+ WebContents* tab = browser()->GetActiveWebContents();
CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, false,
true); // Interstitial showing.
@@ -1007,7 +1006,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestCloseTabWithUnsafePopup) {
ui_test_utils::NavigateToURL(browser(),
test_server()->GetURL(replacement_path));
- WebContents* tab1 = browser()->GetSelectedWebContents();
+ WebContents* tab1 = browser()->GetActiveWebContents();
// It is probably overkill to add a notification for a popup-opening, let's
// just poll.
for (int i = 0; i < 10; i++) {
@@ -1042,7 +1041,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestRedirectBadToGoodHTTPS) {
ui_test_utils::NavigateToURL(browser(), GURL(url1.spec() + url2.spec()));
- WebContents* tab = browser()->GetSelectedWebContents();
+ WebContents* tab = browser()->GetActiveWebContents();
CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, false,
true); // Interstitial showing.
@@ -1062,7 +1061,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestRedirectGoodToBadHTTPS) {
GURL url2 = https_server_expired_.GetURL("files/ssl/google.html");
ui_test_utils::NavigateToURL(browser(), GURL(url1.spec() + url2.spec()));
- WebContents* tab = browser()->GetSelectedWebContents();
+ WebContents* tab = browser()->GetActiveWebContents();
CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, false,
true); // Interstitial showing.
@@ -1077,7 +1076,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestRedirectHTTPToGoodHTTPS) {
ASSERT_TRUE(test_server()->Start());
ASSERT_TRUE(https_server_.Start());
- WebContents* tab = browser()->GetSelectedWebContents();
+ WebContents* tab = browser()->GetActiveWebContents();
// HTTP redirects to good HTTPS.
GURL http_url = test_server()->GetURL("server-redirect?");
@@ -1094,7 +1093,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestRedirectHTTPToBadHTTPS) {
ASSERT_TRUE(test_server()->Start());
ASSERT_TRUE(https_server_expired_.Start());
- WebContents* tab = browser()->GetSelectedWebContents();
+ WebContents* tab = browser()->GetActiveWebContents();
GURL http_url = test_server()->GetURL("server-redirect?");
GURL bad_https_url =
@@ -1121,18 +1120,18 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestRedirectHTTPSToHTTP) {
ui_test_utils::NavigateToURL(browser(),
GURL(https_url.spec() + http_url.spec()));
- CheckUnauthenticatedState(browser()->GetSelectedWebContents());
+ CheckUnauthenticatedState(browser()->GetActiveWebContents());
}
// Visits a page to which we could not connect (bad port) over http and https
// and make sure the security style is correct.
IN_PROC_BROWSER_TEST_F(SSLUITest, TestConnectToBadPort) {
ui_test_utils::NavigateToURL(browser(), GURL("http://localhost:17"));
- CheckUnauthenticatedState(browser()->GetSelectedWebContents());
+ CheckUnauthenticatedState(browser()->GetActiveWebContents());
// Same thing over HTTPS.
ui_test_utils::NavigateToURL(browser(), GURL("https://localhost:17"));
- CheckUnauthenticatedState(browser()->GetSelectedWebContents());
+ CheckUnauthenticatedState(browser()->GetActiveWebContents());
}
//
@@ -1155,7 +1154,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestGoodFrameNavigation) {
https_server_expired_,
&top_frame_path));
- WebContents* tab = browser()->GetSelectedWebContents();
+ WebContents* tab = browser()->GetActiveWebContents();
ui_test_utils::NavigateToURL(browser(),
https_server_.GetURL(top_frame_path));
@@ -1253,7 +1252,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestBadFrameNavigation) {
https_server_expired_,
&top_frame_path));
- WebContents* tab = browser()->GetSelectedWebContents();
+ WebContents* tab = browser()->GetActiveWebContents();
ui_test_utils::NavigateToURL(browser(),
https_server_expired_.GetURL(top_frame_path));
CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, false,
@@ -1292,7 +1291,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestUnauthenticatedFrameNavigation) {
https_server_expired_,
&top_frame_path));
- WebContents* tab = browser()->GetSelectedWebContents();
+ WebContents* tab = browser()->GetActiveWebContents();
ui_test_utils::NavigateToURL(browser(),
test_server()->GetURL(top_frame_path));
CheckUnauthenticatedState(tab);
@@ -1353,7 +1352,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestUnsafeContentsInWorkerFiltered) {
&page_with_unsafe_worker_path));
ui_test_utils::NavigateToURL(browser(), https_server_.GetURL(
page_with_unsafe_worker_path));
- WebContents* tab = browser()->GetSelectedWebContents();
+ WebContents* tab = browser()->GetActiveWebContents();
// Expect Worker not to load insecure content.
CheckWorkerLoadResult(tab, false);
// The bad content is filtered, expect the state to be authenticated.
@@ -1368,7 +1367,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestUnsafeContentsInWorker) {
// the user approves the bad certificate.
ui_test_utils::NavigateToURL(browser(),
https_server_expired_.GetURL("files/ssl/blank_page.html"));
- WebContents* tab = browser()->GetSelectedWebContents();
+ WebContents* tab = browser()->GetActiveWebContents();
CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, false,
true); // Interstitial showing
ProceedThroughInterstitial(tab);
@@ -1403,7 +1402,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITestBlock, TestBlockDisplayingInsecureImage) {
ui_test_utils::NavigateToURL(browser(),
https_server_.GetURL(replacement_path));
- CheckAuthenticatedState(browser()->GetSelectedWebContents(), false);
+ CheckAuthenticatedState(browser()->GetActiveWebContents(), false);
}
// Test that when the browser blocks displaying insecure content (iframes), the
@@ -1422,7 +1421,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITestBlock, TestBlockDisplayingInsecureIframe) {
ui_test_utils::NavigateToURL(browser(),
https_server_.GetURL(replacement_path));
- CheckAuthenticatedState(browser()->GetSelectedWebContents(), false);
+ CheckAuthenticatedState(browser()->GetActiveWebContents(), false);
}
@@ -1442,7 +1441,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITestBlock, TestBlockRunningInsecureContent) {
ui_test_utils::NavigateToURL(browser(),
https_server_.GetURL(replacement_path));
- CheckAuthenticatedState(browser()->GetSelectedWebContents(), false);
+ CheckAuthenticatedState(browser()->GetActiveWebContents(), false);
}
generated by cgit v1.1 at 2025-05-12 14:51:26 +0000