content::ResourceType clean up

- Remove unused using statements
- Remove unnecessary content::
- Include resource_type.h where IsResourceTypeFrame() is used
- Use IsResourceTypeFrame() where we can

R=reillyg@chromium.org,mmenke@chromium.org,mattm@chromium.org,treib@chromium.org
BUG=none

Review-Url: https://codereview.chromium.org/2576663004
Cr-Commit-Position: refs/heads/master@{#438792}

chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc

@@ -355,7 +355,7 @@ void LogMainFrameMetricsOnUIThread(const GURL& url,
 void NotifyUIThreadOfRequestComplete(
     const content::ResourceRequestInfo::WebContentsGetter& web_contents_getter,
     const GURL& url,
-    content::ResourceType resource_type,
+    ResourceType resource_type,
     bool was_cached,
     int net_error,
     int64_t total_received_bytes,

chrome/browser/loader/chrome_resource_dispatcher_host_delegate_browsertest.cc

@@ -138,7 +138,7 @@ class TestDispatcherHostDelegate : public ChromeResourceDispatcherHostDelegate {
   void AppendStandardResourceThrottles(
       net::URLRequest* request,
       content::ResourceContext* resource_context,
-      content::ResourceType resource_type,
+      ResourceType resource_type,
       ScopedVector<content::ResourceThrottle>* throttles) override {
     ++times_stardard_throttles_added_for_url_[request->url()];
     ChromeResourceDispatcherHostDelegate::AppendStandardResourceThrottles(

chrome/browser/net/chrome_network_delegate.cc

@@ -48,6 +48,7 @@
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/process_type.h"
+#include "content/public/common/resource_type.h"
 #include "extensions/features/features.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/load_flags.h"
@@ -79,7 +80,6 @@
 using content::BrowserThread;
 using content::RenderViewHost;
 using content::ResourceRequestInfo;
-using content::ResourceType;
 
 // By default we don't allow access to all file:// urls on ChromeOS and
 // Android.

chrome/browser/search/iframe_source_unittest.cc

@@ -23,8 +23,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
-using content::ResourceType;
-
 const int kNonInstantRendererPID = 0;
 const char kNonInstantOrigin[] = "http://evil";
 const int kInstantRendererPID = 1;

components/safe_browsing_db/v4_local_database_manager.h

@@ -19,8 +19,6 @@
 #include "components/safe_browsing_db/v4_update_protocol_manager.h"
 #include "url/gurl.h"
 
-using content::ResourceType;
-
 namespace safe_browsing {
 
 typedef unsigned ThreatSeverity;

content/browser/loader/resource_dispatcher_host_impl.cc

@@ -1221,10 +1221,7 @@ void ResourceDispatcherHostImpl::CompleteTransfer(
   DCHECK(request_data.transferred_request_child_id != -1 ||
          request_data.transferred_request_request_id != -1);
 
-  bool is_navigational_request =
-      request_data.resource_type == RESOURCE_TYPE_MAIN_FRAME ||
-      request_data.resource_type == RESOURCE_TYPE_SUB_FRAME;
-  if (!is_navigational_request) {
+  if (!IsResourceTypeFrame(request_data.resource_type)) {
     // Transfers apply only to navigational requests - the renderer seems to
     // have sent bogus IPC data.
     bad_message::ReceivedBadMessage(

extensions/browser/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc

@@ -28,7 +28,6 @@ using base::FundamentalValue;
 using base::ListValue;
 using base::StringValue;
 using base::Value;
-using content::ResourceType;
 
 namespace extensions {
 

extensions/browser/api/declarative_webrequest/webrequest_condition_unittest.cc

@@ -18,7 +18,6 @@
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using content::ResourceType;
 using url_matcher::URLMatcher;
 using url_matcher::URLMatcherConditionSet;
 

extensions/browser/extension_protocols.cc

@@ -66,7 +66,6 @@
 
 using content::BrowserThread;
 using content::ResourceRequestInfo;
-using content::ResourceType;
 using extensions::Extension;
 using extensions::SharedModuleInfo;
 

extensions/browser/guest_view/web_view/web_view_guest.cc

@@ -70,7 +70,6 @@ using base::UserMetricsAction;
 using content::GlobalRequestID;
 using content::RenderFrameHost;
 using content::RenderProcessHost;
-using content::ResourceType;
 using content::StoragePartition;
 using content::WebContents;
 using guest_view::GuestViewBase;