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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc

Issue 1082083004: Replace some GURL::SchemeIsSecure callers with SchemeUsesTLS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@origin-is-secure-gurl
Patch Set: Created 5 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/captive_portal/captive_portal_tab_helper.cc ('k') | chrome/browser/content_settings/permission_context_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc
diff --git a/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc b/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc
index cbdf99192bdbea08988791fcd3d6cdbce72a7365..eab6ca1f5cb73a1bc44d105e9295e4fee9688a4d 100644
--- a/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc
+++ b/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc
@@ -87,7 +87,7 @@ class CaptivePortalTabHelperTest : public ChromeRenderViewHostTestHarness {
// Simulates a successful load of |url|.
void SimulateSuccess(const GURL& url,
content::RenderViewHost* render_view_host) {
- EXPECT_CALL(mock_reloader(), OnLoadStart(url.SchemeIsSecure())).Times(1);
+ EXPECT_CALL(mock_reloader(), OnLoadStart(url.SchemeUsesTLS())).Times(1);
tab_helper().DidStartProvisionalLoadForFrame(
render_view_host->GetMainFrame(), url, false, false);
@@ -101,7 +101,7 @@ class CaptivePortalTabHelperTest : public ChromeRenderViewHostTestHarness {
// Simulates a connection timeout while requesting |url|.
void SimulateTimeout(const GURL& url,
content::RenderViewHost* render_view_host) {
- EXPECT_CALL(mock_reloader(), OnLoadStart(url.SchemeIsSecure())).Times(1);
+ EXPECT_CALL(mock_reloader(), OnLoadStart(url.SchemeUsesTLS())).Times(1);
tab_helper().DidStartProvisionalLoadForFrame(
render_view_host->GetMainFrame(), url, false, false);
@@ -125,7 +125,7 @@ class CaptivePortalTabHelperTest : public ChromeRenderViewHostTestHarness {
void SimulateAbort(const GURL& url,
content::RenderViewHost* render_view_host,
NavigationType navigation_type) {
- EXPECT_CALL(mock_reloader(), OnLoadStart(url.SchemeIsSecure())).Times(1);
+ EXPECT_CALL(mock_reloader(), OnLoadStart(url.SchemeUsesTLS())).Times(1);
tab_helper().DidStartProvisionalLoadForFrame(
render_view_host->GetMainFrame(), url, false, false);
@@ -151,7 +151,7 @@ class CaptivePortalTabHelperTest : public ChromeRenderViewHostTestHarness {
void SimulateAbortTimeout(const GURL& url,
content::RenderViewHost* render_view_host,
NavigationType navigation_type) {
- EXPECT_CALL(mock_reloader(), OnLoadStart(url.SchemeIsSecure())).Times(1);
+ EXPECT_CALL(mock_reloader(), OnLoadStart(url.SchemeUsesTLS())).Times(1);
tab_helper().DidStartProvisionalLoadForFrame(
render_view_host->GetMainFrame(), url, false, false);
@@ -334,7 +334,7 @@ TEST_F(CaptivePortalTabHelperTest, UnexpectedProvisionalLoad) {
// A same-site load for the original RenderViewHost starts.
EXPECT_CALL(mock_reloader(),
- OnLoadStart(same_site_url.SchemeIsSecure())).Times(1);
+ OnLoadStart(same_site_url.SchemeUsesTLS())).Times(1);
tab_helper().DidStartProvisionalLoadForFrame(
main_render_frame1(), same_site_url, false, false);
@@ -343,7 +343,7 @@ TEST_F(CaptivePortalTabHelperTest, UnexpectedProvisionalLoad) {
// for the old navigation.
EXPECT_CALL(mock_reloader(), OnAbort()).Times(1);
EXPECT_CALL(mock_reloader(),
- OnLoadStart(cross_process_url.SchemeIsSecure())).Times(1);
+ OnLoadStart(cross_process_url.SchemeUsesTLS())).Times(1);
tab_helper().DidStartProvisionalLoadForFrame(
main_render_frame2(), cross_process_url, false, false);
@@ -378,7 +378,7 @@ TEST_F(CaptivePortalTabHelperTest, UnexpectedCommit) {
// A same-site load for the original RenderViewHost starts.
EXPECT_CALL(mock_reloader(),
- OnLoadStart(same_site_url.SchemeIsSecure())).Times(1);
+ OnLoadStart(same_site_url.SchemeUsesTLS())).Times(1);
tab_helper().DidStartProvisionalLoadForFrame(
main_render_frame1(), same_site_url, false, false);
@@ -387,7 +387,7 @@ TEST_F(CaptivePortalTabHelperTest, UnexpectedCommit) {
// for the old navigation.
EXPECT_CALL(mock_reloader(), OnAbort()).Times(1);
EXPECT_CALL(mock_reloader(),
- OnLoadStart(cross_process_url.SchemeIsSecure())).Times(1);
+ OnLoadStart(cross_process_url.SchemeUsesTLS())).Times(1);
tab_helper().DidStartProvisionalLoadForFrame(
main_render_frame2(), cross_process_url, false, false);
@@ -400,7 +400,7 @@ TEST_F(CaptivePortalTabHelperTest, UnexpectedCommit) {
// The same-site navigation succeeds.
EXPECT_CALL(mock_reloader(), OnAbort()).Times(1);
EXPECT_CALL(mock_reloader(),
- OnLoadStart(same_site_url.SchemeIsSecure())).Times(1);
+ OnLoadStart(same_site_url.SchemeUsesTLS())).Times(1);
EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::OK)).Times(1);
tab_helper().DidCommitProvisionalLoadForFrame(
main_render_frame1(), same_site_url, ui::PAGE_TRANSITION_LINK);
@@ -450,7 +450,7 @@ TEST_F(CaptivePortalTabHelperTest, HttpsSubframeParallelError) {
->AppendChild("subframe");
// Loads start.
- EXPECT_CALL(mock_reloader(), OnLoadStart(url.SchemeIsSecure())).Times(1);
+ EXPECT_CALL(mock_reloader(), OnLoadStart(url.SchemeUsesTLS())).Times(1);
tab_helper().DidStartProvisionalLoadForFrame(
main_render_frame1(), url, false, false);
tab_helper().DidStartProvisionalLoadForFrame(subframe, url, false, false);
@@ -506,12 +506,12 @@ TEST_F(CaptivePortalTabHelperTest, HttpToHttpsRedirectTimeout) {
TEST_F(CaptivePortalTabHelperTest, HttpsToHttpRedirect) {
GURL https_url(kHttpsUrl);
EXPECT_CALL(mock_reloader(),
- OnLoadStart(https_url.SchemeIsSecure())).Times(1);
+ OnLoadStart(https_url.SchemeUsesTLS())).Times(1);
tab_helper().DidStartProvisionalLoadForFrame(
main_render_frame1(), https_url, false, false);
GURL http_url(kHttpUrl);
- EXPECT_CALL(mock_reloader(), OnRedirect(http_url.SchemeIsSecure())).Times(1);
+ EXPECT_CALL(mock_reloader(), OnRedirect(http_url.SchemeUsesTLS())).Times(1);
OnRedirect(content::RESOURCE_TYPE_MAIN_FRAME, http_url,
render_view_host1()->GetProcess()->GetID());
@@ -524,11 +524,11 @@ TEST_F(CaptivePortalTabHelperTest, HttpsToHttpRedirect) {
TEST_F(CaptivePortalTabHelperTest, HttpToHttpRedirect) {
GURL http_url(kHttpUrl);
EXPECT_CALL(mock_reloader(),
- OnLoadStart(http_url.SchemeIsSecure())).Times(1);
+ OnLoadStart(http_url.SchemeUsesTLS())).Times(1);
tab_helper().DidStartProvisionalLoadForFrame(
main_render_frame1(), http_url, false, false);
- EXPECT_CALL(mock_reloader(), OnRedirect(http_url.SchemeIsSecure())).Times(1);
+ EXPECT_CALL(mock_reloader(), OnRedirect(http_url.SchemeUsesTLS())).Times(1);
OnRedirect(content::RESOURCE_TYPE_MAIN_FRAME, http_url,
render_view_host1()->GetProcess()->GetID());
« no previous file with comments | « chrome/browser/captive_portal/captive_portal_tab_helper.cc ('k') | chrome/browser/content_settings/permission_context_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698