Move resource_type.* from webkit/ to content/.

chrome/browser/safe_browsing/browser_feature_extractor.h

 // Copyright (c) 2011 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.
 //
 // BrowserFeatureExtractor computes various browser features for client-side
 // phishing detection.  For now it does a bunch of lookups in the history
 // service to see whether a particular URL has been visited before by the
 // user.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_BROWSER_FEATURE_EXTRACTOR_H_
 #define CHROME_BROWSER_SAFE_BROWSING_BROWSER_FEATURE_EXTRACTOR_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/time/time.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/safe_browsing/ui_manager.h"
+#include "content/public/common/resource_type.h"
 #include "url/gurl.h"
-#include "webkit/common/resource_type.h"
 
 
 class HistoryService;
 
 namespace content {
 class WebContents;
 }
 
 namespace safe_browsing {
 class ClientMalwareRequest;
 class ClientPhishingRequest;
 class ClientSideDetectionHost;
 
 struct IPUrlInfo {
   // The url on the bad IP address.
   std::string url;
   std::string method;
   std::string referrer;
-  ResourceType::Type resource_type;
+  content::ResourceType::Type resource_type;
 
   IPUrlInfo(const std::string& url,
             const std::string& method,
             const std::string& referrer,
-            const ResourceType::Type& resource_type);
+            const content::ResourceType::Type& resource_type);
   ~IPUrlInfo();
 };
 
 typedef std::map<std::string, std::vector<IPUrlInfo> > IPUrlMap;
 
 struct BrowseInfo {
   // The URL we're currently browsing.
   GURL url;
 
   // List of IPv4 and IPv6 addresses from which content was requested
@@ skipping 119 matching lines @@
   content::WebContents* tab_;
   ClientSideDetectionHost* host_;
   base::CancelableTaskTracker cancelable_task_tracker_;
   base::WeakPtrFactory<BrowserFeatureExtractor> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserFeatureExtractor);
 };
 
 }  // namespace safe_browsing
 #endif  // CHROME_BROWSER_SAFE_BROWSING_BROWSER_FEATURE_EXTRACTOR_H_