Move all remaining appcache-related code to content namespace

content/browser/appcache/appcache.h

Index: content/browser/appcache/appcache.h
diff --git a/webkit/browser/appcache/appcache.h b/content/browser/appcache/appcache.h
similarity index 88%
rename from webkit/browser/appcache/appcache.h
rename to content/browser/appcache/appcache.h
index 54713b75a1f38f55a03c1b81dc1d3efc379f0c41..d449139278bf4feb15b0f29df7b9d5c2668be644 100644
--- a/webkit/browser/appcache/appcache.h
+++ b/content/browser/appcache/appcache.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_BROWSER_APPCACHE_APPCACHE_H_
-#define WEBKIT_BROWSER_APPCACHE_APPCACHE_H_
+#ifndef CONTENT_BROWSER_APPCACHE_APPCACHE_H_
+#define CONTENT_BROWSER_APPCACHE_APPCACHE_H_
 
 #include <map>
 #include <set>
@@ -12,11 +12,11 @@
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
+#include "content/browser/appcache/appcache_database.h"
+#include "content/browser/appcache/appcache_entry.h"
+#include "content/browser/appcache/manifest_parser.h"
+#include "content/common/content_export.h"
 #include "url/gurl.h"
-#include "webkit/browser/appcache/appcache_database.h"
-#include "webkit/browser/appcache/appcache_entry.h"
-#include "webkit/browser/appcache/manifest_parser.h"
-#include "webkit/browser/webkit_storage_browser_export.h"
 
 namespace net {
 class IOBuffer;
@@ -30,7 +30,7 @@ class AppCacheStorageImplTest;
 class AppCacheUpdateJobTest;
 }
 
-namespace appcache {
+namespace content {

[jam, 2014/06/25 21:51:14]

nit: merge this with the section above (also in other files)

 
 class AppCacheExecutableHandler;
 class AppCacheGroup;
@@ -40,7 +40,7 @@ class AppCacheStorage;
 // Set of cached resources for an application. A cache exists as long as a
 // host is associated with it, the cache is in an appcache group or the
 // cache is being created during an appcache upate.
-class WEBKIT_STORAGE_BROWSER_EXPORT AppCache
+class CONTENT_EXPORT AppCache
     : public base::RefCounted<AppCache> {
  public:
   typedef std::map<GURL, AppCacheEntry> EntryMap;
@@ -143,8 +143,8 @@ class WEBKIT_STORAGE_BROWSER_EXPORT AppCache
   // Populates the 'infos' vector with an element per entry in the appcache.
   void ToResourceInfoVector(AppCacheResourceInfoVector* infos) const;
 
-  static const Namespace* FindNamespace(
-      const NamespaceVector& namespaces,
+  static const AppCacheNamespace* FindNamespace(
+      const AppCacheNamespaceVector& namespaces,
       const GURL& url);
 
  private:
@@ -161,17 +161,17 @@ class WEBKIT_STORAGE_BROWSER_EXPORT AppCache
   void set_owning_group(AppCacheGroup* group) { owning_group_ = group; }
 
   // FindResponseForRequest helpers
-  const Namespace* FindInterceptNamespace(const GURL& url) {
+  const AppCacheNamespace* FindInterceptNamespace(const GURL& url) {
     return FindNamespace(intercept_namespaces_, url);
   }
-  const Namespace* FindFallbackNamespace(const GURL& url) {
+  const AppCacheNamespace* FindFallbackNamespace(const GURL& url) {
     return FindNamespace(fallback_namespaces_, url);
   }
   bool IsInNetworkNamespace(const GURL& url) {
     return FindNamespace(online_whitelist_namespaces_, url) != NULL;
   }
 
-  GURL GetNamespaceEntryUrl(const NamespaceVector& namespaces,
+  GURL GetNamespaceEntryUrl(const AppCacheNamespaceVector& namespaces,
                             const GURL& namespace_url) const;
 
   // Use AppCacheHost::Associate*Cache() to manipulate host association.
@@ -186,9 +186,9 @@ class WEBKIT_STORAGE_BROWSER_EXPORT AppCache
 
   EntryMap entries_;    // contains entries of all types
 
-  NamespaceVector intercept_namespaces_;
-  NamespaceVector fallback_namespaces_;
-  NamespaceVector online_whitelist_namespaces_;
+  AppCacheNamespaceVector intercept_namespaces_;
+  AppCacheNamespaceVector fallback_namespaces_;
+  AppCacheNamespaceVector online_whitelist_namespaces_;
   bool online_whitelist_all_;
 
   bool is_complete_;
@@ -209,6 +209,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT AppCache
   DISALLOW_COPY_AND_ASSIGN(AppCache);
 };
 
-}  // namespace appcache
+}  // namespace content
 
-#endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_H_
+#endif  // CONTENT_BROWSER_APPCACHE_APPCACHE_H_