Move resource_type.* from webkit/ to content/.

chrome/browser/extensions/api/web_request/web_request_api.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_WEB_REQUEST_WEB_REQUEST_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_WEB_REQUEST_WEB_REQUEST_API_H_
 
 #include <list>
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/memory/singleton.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "chrome/browser/extensions/api/declarative/rules_registry_service.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/request_stage.h"
 #include "chrome/browser/extensions/api/web_request/web_request_api_helpers.h"
 #include "chrome/browser/extensions/api/web_request/web_request_permissions.h"
+#include "content/public/common/resource_type.h"
 #include "extensions/browser/browser_context_keyed_api_factory.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_function.h"
 #include "extensions/common/url_pattern_set.h"
 #include "ipc/ipc_sender.h"
 #include "net/base/completion_callback.h"
 #include "net/base/network_delegate.h"
 #include "net/http/http_request_headers.h"
-#include "webkit/common/resource_type.h"
 
 class ExtensionWebRequestTimeTracker;
 class GURL;
 
 namespace base {
 class DictionaryValue;
 class ListValue;
 class StringValue;
 }
 
@@ skipping 72 matching lines @@
   struct RequestFilter {
     RequestFilter();
     ~RequestFilter();
 
     // Returns false if there was an error initializing. If it is a user error,
     // an error message is provided, otherwise the error is internal (and
     // unexpected).
     bool InitFromValue(const base::DictionaryValue& value, std::string* error);
 
     extensions::URLPatternSet urls;
-    std::vector<ResourceType::Type> types;
+    std::vector<content::ResourceType::Type> types;
     int tab_id;
     int window_id;
   };
 
   // Internal representation of the extraInfoSpec parameter on webRequest
   // events, used to specify extra information to be included with network
   // events.
   struct ExtraInfoSpec {
     enum Flags {
       REQUEST_HEADERS = 1<<0,
@@ skipping 217 matching lines @@
   void GetMatchingListenersImpl(
       void* profile,
       extensions::InfoMap* extension_info_map,
       bool crosses_incognito,
       const std::string& event_name,
       const GURL& url,
       int tab_id,
       int window_id,
       int render_process_host_id,
       int routing_id,
-      ResourceType::Type resource_type,
+      content::ResourceType::Type resource_type,
       bool is_async_request,
       bool is_request_from_extension,
       int* extra_info_spec,
       std::vector<const ExtensionWebRequestEventRouter::EventListener*>*
           matching_listeners);
 
   // Decrements the count of event handlers blocking the given request. When the
   // count reaches 0, we stop blocking the request and proceed it using the
   // method requested by the extension with the highest precedence. Precedence
   // is decided by extension install time. If |response| is non-NULL, this
@@ skipping 149 matching lines @@
   // function.
   virtual void OnQuotaExceeded(const std::string& error) OVERRIDE;
   virtual bool RunSync() OVERRIDE;
 };
 
 // Send updates to |host| with information about what webRequest-related
 // extensions are installed.
 void SendExtensionWebRequestStatusToHost(content::RenderProcessHost* host);
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_WEB_REQUEST_WEB_REQUEST_API_H_