content: ResourceType cleanup.

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 176 matching lines @@
 
 void CaptivePortalTabHelper::OnSSLCertError(const net::SSLInfo& ssl_info) {
   tab_reloader_->OnSSLCertError(ssl_info);
 }
 
 bool CaptivePortalTabHelper::IsLoginTab() const {
   return login_detector_->is_login_tab();
 }
 
 void CaptivePortalTabHelper::OnRedirect(int child_id,
-                                        ResourceType::Type resource_type,
+                                        ResourceType resource_type,
                                         const GURL& new_url) {
   // Only main frame redirects for the provisional RenderViewHost matter.
-  if (resource_type != ResourceType::MAIN_FRAME ||
+  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());
 }
 
 void CaptivePortalTabHelper::OnCaptivePortalResults(
     CaptivePortalResult previous_result,
@@ skipping 47 matching lines @@
   // Otherwise, open a login tab.  Only end up here when a captive portal result
   // was received, so it's safe to assume |profile_| has a CaptivePortalService.
   content::WebContents* web_contents = chrome::AddSelectedTabWithURL(
           browser,
           CaptivePortalServiceFactory::GetForProfile(profile_)->test_url(),
           content::PAGE_TRANSITION_TYPED);
   CaptivePortalTabHelper* captive_portal_tab_helper =
       CaptivePortalTabHelper::FromWebContents(web_contents);
   captive_portal_tab_helper->SetIsLoginTab();
 }