Replace some GURL::SchemeIsSecure callers with SchemeUsesTLS.

chrome/browser/captive_portal/captive_portal_tab_helper.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h"
 
 #include "base/bind.h"
 #include "chrome/browser/captive_portal/captive_portal_login_detector.h"
 #include "chrome/browser/captive_portal/captive_portal_service_factory.h"
 #include "chrome/browser/captive_portal/captive_portal_tab_reloader.h"
@@ skipping 75 matching lines @@
     // row.  The second time, provisional_render_view_host_ will be NULL.
     if (is_error_page && provisional_render_view_host_ == render_view_host)
       return;
     // Otherwise, abort the old load.
     OnLoadAborted();
   }
 
   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(
     content::RenderFrameHost* render_frame_host,
     const GURL& url,
     ui::PageTransition transition_type) {
   DCHECK(CalledOnValidThread());
 
   // Ignore subframes.
   if (render_frame_host->GetParent())
     return;
 
   if (provisional_render_view_host_ == render_frame_host->GetRenderViewHost()) {
     tab_reloader_->OnLoadCommitted(pending_error_code_);
   } else {
     // This may happen if the active RenderView commits a page before a cross
     // process navigation cancels the old load.  In this case, the commit of the
     // old navigation will cancel the newer one.
     OnLoadAborted();
 
     // Send information about the new load.
-    tab_reloader_->OnLoadStart(url.SchemeIsSecure());
+    tab_reloader_->OnLoadStart(url.SchemeUsesTLS());
     tab_reloader_->OnLoadCommitted(net::OK);
   }
 
   provisional_render_view_host_ = NULL;
   pending_error_code_ = net::OK;
 }
 
 void CaptivePortalTabHelper::DidFailProvisionalLoad(
     content::RenderFrameHost* render_frame_host,
     const GURL& validated_url,
@@ skipping 103 matching lines @@
 void CaptivePortalTabHelper::OnRedirect(int child_id,
                                         ResourceType resource_type,
                                         const GURL& new_url) {
   // Only main frame redirects for the provisional RenderViewHost matter.
   if (resource_type != content::RESOURCE_TYPE_MAIN_FRAME ||
       !provisional_render_view_host_ ||
       provisional_render_view_host_->GetProcess()->GetID() != child_id) {
     return;
   }
 
-  tab_reloader_->OnRedirect(new_url.SchemeIsSecure());
+  tab_reloader_->OnRedirect(new_url.SchemeUsesTLS());
 }
 
 void CaptivePortalTabHelper::OnCaptivePortalResults(
     CaptivePortalResult previous_result,
     CaptivePortalResult result) {
   tab_reloader_->OnCaptivePortalResults(previous_result, result);
   login_detector_->OnCaptivePortalResults(previous_result, result);
 }
 
 void CaptivePortalTabHelper::OnLoadAborted() {
@@ skipping 10 matching lines @@
 }
 
 void CaptivePortalTabHelper::SetTabReloaderForTest(
     CaptivePortalTabReloader* tab_reloader) {
   tab_reloader_.reset(tab_reloader);
 }
 
 CaptivePortalTabReloader* CaptivePortalTabHelper::GetTabReloaderForTest() {
   return tab_reloader_.get();
 }