content: ResourceType cleanup.

android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc

Index: android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
diff --git a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
index 981acf5b6b5c23ca89eca76104b0c46df45f32a0..f55b36aac95f50e37add07d8180d5d7eef770676 100644
--- a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
+++ b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
@@ -211,7 +211,7 @@ 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) {
@@ -232,7 +232,7 @@ void AwResourceDispatcherHostDelegate::RequestBeginning(
   // 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));
 }
@@ -321,7 +321,7 @@ void AwResourceDispatcherHostDelegate::OnResponseStarted(
     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(
@@ -403,8 +403,10 @@ void AwResourceDispatcherHostDelegate::AddExtraHeadersIfNeeded(
     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 =