Move all remaining appcache-related code to content namespace

content/browser/appcache/appcache_storage_impl.cc

Index: content/browser/appcache/appcache_storage_impl.cc
diff --git a/webkit/browser/appcache/appcache_storage_impl.cc b/content/browser/appcache/appcache_storage_impl.cc
similarity index 98%
rename from webkit/browser/appcache/appcache_storage_impl.cc
rename to content/browser/appcache/appcache_storage_impl.cc
index 62563d7ff1b5f2bb637f2f3fc294f6c6922d6a9a..dee1f9cd281649d797dc36bae4fda083ff1ec482 100644
--- a/webkit/browser/appcache/appcache_storage_impl.cc
+++ b/content/browser/appcache/appcache_storage_impl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/browser/appcache/appcache_storage_impl.h"
+#include "content/browser/appcache/appcache_storage_impl.h"
 
 #include <algorithm>
 #include <functional>
@@ -16,24 +16,24 @@
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
+#include "content/browser/appcache/appcache.h"
+#include "content/browser/appcache/appcache_database.h"
+#include "content/browser/appcache/appcache_entry.h"
+#include "content/browser/appcache/appcache_group.h"
+#include "content/browser/appcache/appcache_histograms.h"
+#include "content/browser/appcache/appcache_quota_client.h"
+#include "content/browser/appcache/appcache_response.h"
+#include "content/browser/appcache/appcache_service_impl.h"
 #include "net/base/cache_type.h"
 #include "net/base/net_errors.h"
 #include "sql/connection.h"
 #include "sql/transaction.h"
-#include "webkit/browser/appcache/appcache.h"
-#include "webkit/browser/appcache/appcache_database.h"
-#include "webkit/browser/appcache/appcache_entry.h"
-#include "webkit/browser/appcache/appcache_group.h"
-#include "webkit/browser/appcache/appcache_histograms.h"
-#include "webkit/browser/appcache/appcache_quota_client.h"
-#include "webkit/browser/appcache/appcache_response.h"
-#include "webkit/browser/appcache/appcache_service_impl.h"
 #include "webkit/browser/quota/quota_client.h"
 #include "webkit/browser/quota/quota_manager.h"
 #include "webkit/browser/quota/quota_manager_proxy.h"
 #include "webkit/browser/quota/special_storage_policy.h"
 
-namespace appcache {
+namespace content {
 
 // Hard coded default when not using quota management.
 static const int kDefaultQuota = 5 * 1024 * 1024;
@@ -841,7 +841,7 @@ class NetworkNamespaceHelper {
   bool IsInNetworkNamespace(const GURL& url, int64 cache_id) {
     typedef std::pair<WhiteListMap::iterator, bool> InsertResult;
     InsertResult result = namespaces_map_.insert(
-        WhiteListMap::value_type(cache_id, NamespaceVector()));
+        WhiteListMap::value_type(cache_id, AppCacheNamespaceVector()));
     if (result.second)
       GetOnlineWhiteListForCache(cache_id, &result.first->second);
     return AppCache::FindNamespace(result.first->second, url) != NULL;
@@ -849,7 +849,7 @@ class NetworkNamespaceHelper {
 
  private:
   void GetOnlineWhiteListForCache(
-      int64 cache_id, NamespaceVector* namespaces) {
+      int64 cache_id, AppCacheNamespaceVector* namespaces) {
     DCHECK(namespaces && namespaces->empty());
     typedef std::vector<AppCacheDatabase::OnlineWhiteListRecord>
         WhiteListVector;
@@ -859,14 +859,14 @@ class NetworkNamespaceHelper {
     WhiteListVector::const_iterator iter = records.begin();
     while (iter != records.end()) {
       namespaces->push_back(
-            Namespace(APPCACHE_NETWORK_NAMESPACE, iter->namespace_url, GURL(),
-                      iter->is_pattern));
+            AppCacheNamespace(APPCACHE_NETWORK_NAMESPACE, iter->namespace_url,
+                GURL(), iter->is_pattern));
       ++iter;
     }
   }
 
   // Key is cache id
-  typedef std::map<int64, NamespaceVector> WhiteListMap;
+  typedef std::map<int64, AppCacheNamespaceVector> WhiteListMap;
   WhiteListMap namespaces_map_;
   AppCacheDatabase* database_;
 };
@@ -1857,4 +1857,4 @@ void AppCacheStorageImpl::CallScheduleReinitialize() {
   // note: 'this' may be deleted at this point.
 }
 
-}  // namespace appcache
+}  // namespace content