Move all remaining appcache-related code to content namespace

content/browser/appcache/appcache.cc

Index: content/browser/appcache/appcache.cc
diff --git a/webkit/browser/appcache/appcache.cc b/content/browser/appcache/appcache.cc
similarity index 92%
rename from webkit/browser/appcache/appcache.cc
rename to content/browser/appcache/appcache.cc
index 9179a4090f79f2c1ec1cf17d395b3f2aaa2c6801..7b23f64b448761dcccb05853fb1d4c957a3a2993 100644
--- a/webkit/browser/appcache/appcache.cc
+++ b/content/browser/appcache/appcache.cc
@@ -2,19 +2,19 @@
 // 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.h"
+#include "content/browser/appcache/appcache.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
-#include "webkit/browser/appcache/appcache_executable_handler.h"
-#include "webkit/browser/appcache/appcache_group.h"
-#include "webkit/browser/appcache/appcache_host.h"
-#include "webkit/browser/appcache/appcache_storage.h"
-#include "webkit/common/appcache/appcache_interfaces.h"
+#include "content/browser/appcache/appcache_executable_handler.h"
+#include "content/browser/appcache/appcache_group.h"
+#include "content/browser/appcache/appcache_host.h"
+#include "content/browser/appcache/appcache_storage.h"
+#include "content/common/appcache_interfaces.h"
 
-namespace appcache {
+namespace content {
 
 AppCache::AppCache(AppCacheStorage* storage, int64 cache_id)
     : cache_id_(cache_id),
@@ -115,7 +115,7 @@ AppCacheExecutableHandler* AppCache::GetOrCreateExecutableHandler(
   return handler;
 }
 
-GURL AppCache::GetNamespaceEntryUrl(const NamespaceVector& namespaces,
+GURL AppCache::GetNamespaceEntryUrl(const AppCacheNamespaceVector& namespaces,
                                     const GURL& namespace_url) const {
   size_t count = namespaces.size();
   for (size_t i = 0; i < count; ++i) {
@@ -128,7 +128,7 @@ GURL AppCache::GetNamespaceEntryUrl(const NamespaceVector& namespaces,
 
 namespace {
 bool SortNamespacesByLength(
-    const Namespace& lhs, const Namespace& rhs) {
+    const AppCacheNamespace& lhs, const AppCacheNamespace& rhs) {
   return lhs.namespace_url.spec().length() > rhs.namespace_url.spec().length();
 }
 }
@@ -181,7 +181,7 @@ void AppCache::InitializeWithDatabaseRecords(
   for (size_t i = 0; i < whitelists.size(); ++i) {
     const AppCacheDatabase::OnlineWhiteListRecord& record = whitelists.at(i);
     online_whitelist_namespaces_.push_back(
-        Namespace(APPCACHE_NETWORK_NAMESPACE,
+        AppCacheNamespace(APPCACHE_NETWORK_NAMESPACE,
                   record.namespace_url,
                   GURL(),
                   record.is_pattern));
@@ -268,7 +268,8 @@ bool AppCache::FindResponseForRequest(const GURL& url,
   if ((*found_network_namespace = IsInNetworkNamespace(url_no_ref)))
     return true;
 
-  const Namespace* intercept_namespace = FindInterceptNamespace(url_no_ref);
+  const AppCacheNamespace* intercept_namespace =
+      FindInterceptNamespace(url_no_ref);
   if (intercept_namespace) {
     entry = GetEntry(intercept_namespace->target_url);
     DCHECK(entry);
@@ -277,7 +278,8 @@ bool AppCache::FindResponseForRequest(const GURL& url,
     return true;
   }
 
-  const Namespace* fallback_namespace = FindFallbackNamespace(url_no_ref);
+  const AppCacheNamespace* fallback_namespace =
+      FindFallbackNamespace(url_no_ref);
   if (fallback_namespace) {
     entry = GetEntry(fallback_namespace->target_url);
     DCHECK(entry);
@@ -310,8 +312,8 @@ void AppCache::ToResourceInfoVector(AppCacheResourceInfoVector* infos) const {
 }
 
 // static
-const Namespace* AppCache::FindNamespace(
-    const NamespaceVector& namespaces,
+const AppCacheNamespace* AppCache::FindNamespace(
+    const AppCacheNamespaceVector& namespaces,
     const GURL& url) {
   size_t count = namespaces.size();
   for (size_t i = 0; i < count; ++i) {
@@ -321,4 +323,4 @@ const Namespace* AppCache::FindNamespace(
   return NULL;
 }
 
-}  // namespace appcache
+}  // namespace content