content: ResourceType cleanup.

android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.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 "android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h"
 
 #include <string>
 
 #include "android_webview/browser/aw_contents_io_thread_client.h"
 #include "android_webview/browser/aw_login_delegate.h"
@@ skipping 193 matching lines @@
     : content::ResourceDispatcherHostDelegate() {
 }
 
 AwResourceDispatcherHostDelegate::~AwResourceDispatcherHostDelegate() {
 }
 
 void AwResourceDispatcherHostDelegate::RequestBeginning(
     net::URLRequest* request,
     content::ResourceContext* resource_context,
     content::AppCacheService* appcache_service,
-    ResourceType::Type resource_type,
+    ResourceType resource_type,
     int child_id,
     int route_id,
     ScopedVector<content::ResourceThrottle>* throttles) {
 
   AddExtraHeadersIfNeeded(request, resource_context);
 
   const content::ResourceRequestInfo* request_info =
       content::ResourceRequestInfo::ForRequest(request);
 
   // We always push the throttles here. Checking the existence of io_client
   // is racy when a popup window is created. That is because RequestBeginning
   // is called whether or not requests are blocked via BlockRequestForRoute()
   // however io_client may or may not be ready at the time depending on whether
   // webcontents is created.
   throttles->push_back(new IoThreadClientThrottle(
       child_id, request_info->GetRenderFrameID(), request));
 
   // We allow intercepting only navigations within main frames. This
   // is used to post onPageStarted. We handle shouldOverrideUrlLoading
   // via a sync IPC.
-  if (resource_type == ResourceType::MAIN_FRAME)
+  if (resource_type == content::RESOURCE_TYPE_MAIN_FRAME)
     throttles->push_back(InterceptNavigationDelegate::CreateThrottleFor(
         request));
 }
 
 void AwResourceDispatcherHostDelegate::OnRequestRedirected(
     const GURL& redirect_url,
     net::URLRequest* request,
     content::ResourceContext* resource_context,
     content::ResourceResponse* response) {
   AddExtraHeadersIfNeeded(request, resource_context);
@@ skipping 68 matching lines @@
     content::ResourceResponse* response,
     IPC::Sender* sender) {
   const content::ResourceRequestInfo* request_info =
       content::ResourceRequestInfo::ForRequest(request);
   if (!request_info) {
     DLOG(FATAL) << "Started request without associated info: " <<
         request->url();
     return;
   }
 
-  if (request_info->GetResourceType() == ResourceType::MAIN_FRAME) {
+  if (request_info->GetResourceType() == content::RESOURCE_TYPE_MAIN_FRAME) {
     // Check for x-auto-login header.
     auto_login_parser::HeaderData header_data;
     if (auto_login_parser::ParserHeaderInResponse(
             request, auto_login_parser::ALLOW_ANY_REALM, &header_data)) {
       scoped_ptr<AwContentsIoThreadClient> io_client =
           AwContentsIoThreadClient::FromID(request_info->GetChildID(),
                                            request_info->GetRenderFrameID());
       if (io_client) {
         io_client->NewLoginRequest(
             header_data.realm, header_data.account, header_data.args);
@@ skipping 61 matching lines @@
     throttle->OnIoThreadClientReady(new_render_process_id, new_render_frame_id);
     pending_throttles_.erase(it);
   }
 }
 
 void AwResourceDispatcherHostDelegate::AddExtraHeadersIfNeeded(
     net::URLRequest* request,
     content::ResourceContext* resource_context) {
   const content::ResourceRequestInfo* request_info =
       content::ResourceRequestInfo::ForRequest(request);
-  if (!request_info) return;
-  if (request_info->GetResourceType() != ResourceType::MAIN_FRAME) return;
+  if (!request_info)
+    return;
+  if (request_info->GetResourceType() != content::RESOURCE_TYPE_MAIN_FRAME)
+    return;
 
   const content::PageTransition transition = request_info->GetPageTransition();
   const bool is_load_url =
       transition & content::PAGE_TRANSITION_FROM_API;
   const bool is_go_back_forward =
       transition & content::PAGE_TRANSITION_FORWARD_BACK;
   const bool is_reload = content::PageTransitionCoreTypeIs(
       transition, content::PAGE_TRANSITION_RELOAD);
   if (is_load_url || is_go_back_forward || is_reload) {
     AwResourceContext* awrc = static_cast<AwResourceContext*>(resource_context);
     std::string extra_headers = awrc->GetExtraHeaders(request->url());
     if (!extra_headers.empty()) {
       net::HttpRequestHeaders headers;
       headers.AddHeadersFromString(extra_headers);
       for (net::HttpRequestHeaders::Iterator it(headers); it.GetNext(); ) {
         request->SetExtraRequestHeaderByName(it.name(), it.value(), false);
       }
     }
   }
 }
 
 }  // namespace android_webview