Move all remaining appcache-related code to content namespace

This introduces NO FUNCTIONAL CHANGES. It is strictly a file move and namespace change.

BUG=338338
R=michaeln@chromium.org
TBR=cevans, darin

Review URL: https://codereview.chromium.org/344493002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279808 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 26 insertions, 28 deletions

diff --git a/chrome/browser/browsing_data/browsing_data_appcache_helper.cc b/chrome/browser/browsing_data/browsing_data_appcache_helper.cc
index 9810d02..8fb5d42 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);
 }
diff --git a/chrome/browser/browsing_data/browsing_data_appcache_helper.h b/chrome/browser/browsing_data/browsing_data_appcache_helper.h
index 8a23ba2..6a7ea6a34 100644
--- a/chrome/browser/browsing_data/browsing_data_appcache_helper.h
+++ b/chrome/browser/browsing_data/browsing_data_appcache_helper.h
@@ -7,13 +7,13 @@
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
+#include "content/public/browser/appcache_service.h"
 #include "net/base/completion_callback.h"
 #include "url/gurl.h"
-#include "webkit/browser/appcache/appcache_service.h"
 
 class Profile;
 
-namespace appcache {
+namespace content {
 class AppCacheService;
 }
 
@@ -22,14 +22,14 @@ class AppCacheService;
 class BrowsingDataAppCacheHelper
     : public base::RefCountedThreadSafe<BrowsingDataAppCacheHelper> {
  public:
-  typedef std::map<GURL, appcache::AppCacheInfoVector> OriginAppCacheInfoMap;
+  typedef std::map<GURL, content::AppCacheInfoVector> OriginAppCacheInfoMap;
 
   explicit BrowsingDataAppCacheHelper(Profile* profile);
 
   virtual void StartFetching(const base::Closure& completion_callback);
   virtual void DeleteAppCacheGroup(const GURL& manifest_url);
 
-  appcache::AppCacheInfoCollection* info_collection() const {
+  content::AppCacheInfoCollection* info_collection() const {
     DCHECK(!is_fetching_);
     return info_collection_.get();
   }
@@ -39,13 +39,13 @@ class BrowsingDataAppCacheHelper
   virtual ~BrowsingDataAppCacheHelper();
 
   base::Closure completion_callback_;
-  scoped_refptr<appcache::AppCacheInfoCollection> info_collection_;
+  scoped_refptr<content::AppCacheInfoCollection> info_collection_;
 
  private:
   void OnFetchComplete(int rv);
 
   bool is_fetching_;
-  appcache::AppCacheService* appcache_service_;
+  content::AppCacheService* appcache_service_;
   net::CancelableCompletionCallback appcache_info_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataAppCacheHelper);
diff --git a/chrome/browser/browsing_data/browsing_data_appcache_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_appcache_helper_unittest.cc
index 4589574..5040b1e 100644
--- a/chrome/browser/browsing_data/browsing_data_appcache_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_appcache_helper_unittest.cc
@@ -56,7 +56,7 @@ TEST_F(CannedBrowsingDataAppCacheHelperTest, SetInfo) {
                                    base::Unretained(&callback)));
   ASSERT_TRUE(callback.have_result());
 
-  std::map<GURL, appcache::AppCacheInfoVector>& collection =
+  std::map<GURL, content::AppCacheInfoVector>& collection =
       helper->info_collection()->infos_by_origin;
 
   ASSERT_EQ(2u, collection.size());
@@ -88,7 +88,7 @@ TEST_F(CannedBrowsingDataAppCacheHelperTest, Unique) {
                                    base::Unretained(&callback)));
   ASSERT_TRUE(callback.have_result());
 
-  std::map<GURL, appcache::AppCacheInfoVector>& collection =
+  std::map<GURL, content::AppCacheInfoVector>& collection =
       helper->info_collection()->infos_by_origin;
 
   ASSERT_EQ(1u, collection.size());
diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
index a47a92f..c4de8ee 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
@@ -142,7 +142,7 @@ class TestStoragePartition : public StoragePartition {
   virtual quota::QuotaManager* GetQuotaManager() OVERRIDE {
     return NULL;
   }
-  virtual appcache::AppCacheService* GetAppCacheService() OVERRIDE {
+  virtual content::AppCacheService* GetAppCacheService() OVERRIDE {
     return NULL;
   }
   virtual fileapi::FileSystemContext* GetFileSystemContext() OVERRIDE {
diff --git a/chrome/browser/browsing_data/cookies_tree_model.cc b/chrome/browser/browsing_data/cookies_tree_model.cc
index 5663eb0..f1c15e2 100644
--- a/chrome/browser/browsing_data/cookies_tree_model.cc
+++ b/chrome/browser/browsing_data/cookies_tree_model.cc
@@ -214,7 +214,7 @@ CookieTreeNode::DetailedInfo& CookieTreeNode::DetailedInfo::InitSessionStorage(
 
 CookieTreeNode::DetailedInfo& CookieTreeNode::DetailedInfo::InitAppCache(
     const GURL& origin,
-    const appcache::AppCacheInfo* appcache_info) {
+    const content::AppCacheInfo* appcache_info) {
   Init(TYPE_APPCACHE);
   this->appcache_info = appcache_info;
   this->origin = origin;
@@ -301,7 +301,7 @@ CookieTreeNode::DetailedInfo CookieTreeCookieNode::GetDetailedInfo() const {
 
 CookieTreeAppCacheNode::CookieTreeAppCacheNode(
     const GURL& origin_url,
-    std::list<appcache::AppCacheInfo>::iterator appcache_info)
+    std::list<content::AppCacheInfo>::iterator appcache_info)
     : CookieTreeNode(base::UTF8ToUTF16(appcache_info->manifest_url.spec())),
       origin_url_(origin_url),
       appcache_info_(appcache_info) {
@@ -1046,7 +1046,7 @@ void CookiesTreeModel::PopulateAppCacheInfoWithFilter(
     LocalDataContainer* container,
     ScopedBatchUpdateNotifier* notifier,
     const base::string16& filter) {
-  using appcache::AppCacheInfo;
+  using content::AppCacheInfo;
   typedef std::map<GURL, std::list<AppCacheInfo> > InfoByOrigin;
   CookieTreeRootNode* root = static_cast<CookieTreeRootNode*>(GetRoot());
 
diff --git a/chrome/browser/browsing_data/cookies_tree_model.h b/chrome/browser/browsing_data/cookies_tree_model.h
index 106a8fe..c0fae8f 100644
--- a/chrome/browser/browsing_data/cookies_tree_model.h
+++ b/chrome/browser/browsing_data/cookies_tree_model.h
@@ -111,7 +111,7 @@ class CookieTreeNode : public ui::TreeNode<CookieTreeNode> {
         const BrowsingDataLocalStorageHelper::LocalStorageInfo*
         session_storage_info);
     DetailedInfo& InitAppCache(const GURL& origin,
-                               const appcache::AppCacheInfo* appcache_info);
+                               const content::AppCacheInfo* appcache_info);
     DetailedInfo& InitIndexedDB(
         const content::IndexedDBInfo* indexed_db_info);
     DetailedInfo& InitFileSystem(
@@ -129,7 +129,7 @@ class CookieTreeNode : public ui::TreeNode<CookieTreeNode> {
     const BrowsingDataLocalStorageHelper::LocalStorageInfo* local_storage_info;
     const BrowsingDataLocalStorageHelper::LocalStorageInfo*
         session_storage_info;
-    const appcache::AppCacheInfo* appcache_info;
+    const content::AppCacheInfo* appcache_info;
     const content::IndexedDBInfo* indexed_db_info;
     const BrowsingDataFileSystemHelper::FileSystemInfo* file_system_info;
     const BrowsingDataQuotaHelper::QuotaInfo* quota_info;
@@ -288,7 +288,7 @@ class CookieTreeAppCacheNode : public CookieTreeNode {
   // CookieTreeAppCacheNode is valid.
   explicit CookieTreeAppCacheNode(
       const GURL& origin_url,
-      std::list<appcache::AppCacheInfo>::iterator appcache_info);
+      std::list<content::AppCacheInfo>::iterator appcache_info);
   virtual ~CookieTreeAppCacheNode();
 
   virtual void DeleteStoredObjects() OVERRIDE;
@@ -296,7 +296,7 @@ class CookieTreeAppCacheNode : public CookieTreeNode {
 
  private:
   GURL origin_url_;
-  std::list<appcache::AppCacheInfo>::iterator appcache_info_;
+  std::list<content::AppCacheInfo>::iterator appcache_info_;
   DISALLOW_COPY_AND_ASSIGN(CookieTreeAppCacheNode);
 };
 
diff --git a/chrome/browser/browsing_data/local_data_container.cc b/chrome/browser/browsing_data/local_data_container.cc
index f051296..b7648de 100644
--- a/chrome/browser/browsing_data/local_data_container.cc
+++ b/chrome/browser/browsing_data/local_data_container.cc
@@ -108,9 +108,9 @@ void LocalDataContainer::Init(CookiesTreeModel* model) {
 }
 
 void LocalDataContainer::OnAppCacheModelInfoLoaded() {
-  using appcache::AppCacheInfo;
-  using appcache::AppCacheInfoCollection;
-  using appcache::AppCacheInfoVector;
+  using content::AppCacheInfo;
+  using content::AppCacheInfoCollection;
+  using content::AppCacheInfoVector;
   typedef std::map<GURL, AppCacheInfoVector> InfoByOrigin;
 
   scoped_refptr<AppCacheInfoCollection> appcache_info =
diff --git a/chrome/browser/browsing_data/local_data_container.h b/chrome/browser/browsing_data/local_data_container.h
index b50dfb2..1cf4265 100644
--- a/chrome/browser/browsing_data/local_data_container.h
+++ b/chrome/browser/browsing_data/local_data_container.h
@@ -46,7 +46,7 @@ typedef std::list<BrowsingDataFileSystemHelper::FileSystemInfo>
     FileSystemInfoList;
 typedef std::list<BrowsingDataQuotaHelper::QuotaInfo> QuotaInfoList;
 typedef net::ServerBoundCertStore::ServerBoundCertList ServerBoundCertList;
-typedef std::map<GURL, std::list<appcache::AppCacheInfo> > AppCacheInfoMap;
+typedef std::map<GURL, std::list<content::AppCacheInfo> > AppCacheInfoMap;
 typedef std::vector<std::string> FlashLSODomainList;
 
 } // namespace