Move all remaining appcache-related code to content namespace

chrome/browser/browsing_data/browsing_data_appcache_helper.cc

Index: chrome/browser/browsing_data/browsing_data_appcache_helper.cc
diff --git a/chrome/browser/browsing_data/browsing_data_appcache_helper.cc b/chrome/browser/browsing_data/browsing_data_appcache_helper.cc
index 9810d0251138974933f54edbb57e5a867218be4f..8fb5d42ae166b06b9bdd02a92b1f6bdfbab4fc39 100644
--- a/chrome/browser/browsing_data/browsing_data_appcache_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_appcache_helper.cc
@@ -12,8 +12,6 @@
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
-#include "webkit/browser/appcache/appcache_database.h"
-#include "webkit/browser/appcache/appcache_storage.h"
 
 using content::BrowserThread;
 using content::BrowserContext;
@@ -29,7 +27,7 @@ void BrowsingDataAppCacheHelper::StartFetching(const base::Closure& callback) {
     DCHECK(!is_fetching_);
     DCHECK_EQ(false, callback.is_null());
     is_fetching_ = true;
-    info_collection_ = new appcache::AppCacheInfoCollection;
+    info_collection_ = new content::AppCacheInfoCollection;
     completion_callback_ = callback;
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
@@ -65,7 +63,7 @@ void BrowsingDataAppCacheHelper::OnFetchComplete(int rv) {
   if (BrowserThread::CurrentlyOn(BrowserThread::IO)) {
     // Filter out appcache info entries for non-websafe schemes. Extension state
     // and DevTools, for example, are not considered browsing data.
-    typedef std::map<GURL, appcache::AppCacheInfoVector> InfoByOrigin;
+    typedef std::map<GURL, content::AppCacheInfoVector> InfoByOrigin;
     InfoByOrigin& origin_map = info_collection_->infos_by_origin;
     for (InfoByOrigin::iterator origin = origin_map.begin();
          origin != origin_map.end();) {
@@ -92,7 +90,7 @@ CannedBrowsingDataAppCacheHelper::CannedBrowsingDataAppCacheHelper(
     Profile* profile)
     : BrowsingDataAppCacheHelper(profile),
       profile_(profile) {
-  info_collection_ = new appcache::AppCacheInfoCollection;
+  info_collection_ = new content::AppCacheInfoCollection;
 }
 
 CannedBrowsingDataAppCacheHelper* CannedBrowsingDataAppCacheHelper::Clone() {
@@ -109,17 +107,17 @@ void CannedBrowsingDataAppCacheHelper::AddAppCache(const GURL& manifest_url) {
     return;  // Ignore non-websafe schemes.
 
   OriginAppCacheInfoMap& origin_map = info_collection_->infos_by_origin;
-  appcache::AppCacheInfoVector& appcache_infos_ =
+  content::AppCacheInfoVector& appcache_infos_ =
       origin_map[manifest_url.GetOrigin()];
 
-  for (appcache::AppCacheInfoVector::iterator
+  for (content::AppCacheInfoVector::iterator
        appcache = appcache_infos_.begin(); appcache != appcache_infos_.end();
        ++appcache) {
     if (appcache->manifest_url == manifest_url)
       return;
   }
 
-  appcache::AppCacheInfo info;
+  content::AppCacheInfo info;
   info.manifest_url = manifest_url;
   appcache_infos_.push_back(info);
 }