diff options
5 files changed, 24 insertions, 24 deletions
diff --git a/chrome/browser/captive_portal/captive_portal_tab_helper.cc b/chrome/browser/captive_portal/captive_portal_tab_helper.cc index 978025d..2b63c03 100644 --- a/chrome/browser/captive_portal/captive_portal_tab_helper.cc +++ b/chrome/browser/captive_portal/captive_portal_tab_helper.cc @@ -93,7 +93,7 @@ void CaptivePortalTabHelper::DidStartProvisionalLoadForFrame( provisional_render_view_host_ = render_view_host; pending_error_code_ = net::OK; - tab_reloader_->OnLoadStart(validated_url.SchemeIsSecure()); + tab_reloader_->OnLoadStart(validated_url.SchemeUsesTLS()); } void CaptivePortalTabHelper::DidCommitProvisionalLoadForFrame( @@ -115,7 +115,7 @@ void CaptivePortalTabHelper::DidCommitProvisionalLoadForFrame( OnLoadAborted(); // Send information about the new load. - tab_reloader_->OnLoadStart(url.SchemeIsSecure()); + tab_reloader_->OnLoadStart(url.SchemeUsesTLS()); tab_reloader_->OnLoadCommitted(net::OK); } @@ -239,7 +239,7 @@ void CaptivePortalTabHelper::OnRedirect(int child_id, return; } - tab_reloader_->OnRedirect(new_url.SchemeIsSecure()); + tab_reloader_->OnRedirect(new_url.SchemeUsesTLS()); } void CaptivePortalTabHelper::OnCaptivePortalResults( 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 cbdf991..eab6ca1 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()); diff --git a/chrome/browser/net/certificate_error_reporter.cc b/chrome/browser/net/certificate_error_reporter.cc index 15dad13..8d5b5d8 100644 --- a/chrome/browser/net/certificate_error_reporter.cc +++ b/chrome/browser/net/certificate_error_reporter.cc @@ -47,8 +47,8 @@ void CertificateErrorReporter::SendReport(ReportType type, SendCertLoggerRequest(request); break; case REPORT_TYPE_EXTENDED_REPORTING: - // TODO(estark): Encrypt the report if not sending over HTTPS - DCHECK(upload_url_.SchemeIsSecure()); + // TODO(estark): Encrypt the report if not sending over HTTPS. + DCHECK(upload_url_.SchemeUsesTLS()); SendCertLoggerRequest(request); break; default: diff --git a/chrome/utility/importer/ie_importer_win.cc b/chrome/utility/importer/ie_importer_win.cc index c9f9f62..8da54a3 100644 --- a/chrome/utility/importer/ie_importer_win.cc +++ b/chrome/utility/importer/ie_importer_win.cc @@ -632,9 +632,9 @@ void IEImporter::ImportPasswordsIE6() { // This is not precise, because a scheme of https does not imply a valid // certificate was presented; however we assign it this way so that if we // import a password from IE whose scheme is https, we give it the benefit - // of the doubt and DONT auto-fill it unless the form appears under - // valid SSL conditions. - form.ssl_valid = url.SchemeIsSecure(); + // of the doubt and DON'T auto-fill it unless the form appears under + // valid TLS conditions. + form.ssl_valid = url.SchemeUsesTLS(); // Goes through the list to find out the username field // of the web page. diff --git a/chrome/utility/importer/nss_decryptor.cc b/chrome/utility/importer/nss_decryptor.cc index 6d6d676..5c54638 100644 --- a/chrome/utility/importer/nss_decryptor.cc +++ b/chrome/utility/importer/nss_decryptor.cc @@ -202,7 +202,7 @@ void NSSDecryptor::ParseSignons( form.signon_realm = form.origin.GetOrigin().spec(); if (!realm.empty()) form.signon_realm += realm; - form.ssl_valid = form.origin.SchemeIsSecure(); + form.ssl_valid = form.origin.SchemeUsesTLS(); ++begin; // There may be multiple username/password pairs for this site. @@ -296,7 +296,7 @@ bool NSSDecryptor::ReadAndParseSignons(const base::FilePath& sqlite_file, // digest_auth entry, so let's assume basic_auth. form.scheme = autofill::PasswordForm::SCHEME_BASIC; } - form.ssl_valid = form.origin.SchemeIsSecure(); + form.ssl_valid = form.origin.SchemeUsesTLS(); // The user name, password and action. form.username_element = s2.ColumnString16(3); form.username_value = Decrypt(s2.ColumnString(5)); |