Move all remaining appcache-related code to content namespace

content/browser/appcache/appcache_database.h

Index: content/browser/appcache/appcache_database.h
diff --git a/webkit/browser/appcache/appcache_database.h b/content/browser/appcache/appcache_database.h
similarity index 93%
rename from webkit/browser/appcache/appcache_database.h
rename to content/browser/appcache/appcache_database.h
index 93bc1bfc3d62c95f6f0c8bf3706fab41161de6f4..2fe5e12b02693c3c9251e0352b70dcf45108295a 100644
--- a/webkit/browser/appcache/appcache_database.h
+++ b/content/browser/appcache/appcache_database.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_DATABASE_H_
-#define WEBKIT_BROWSER_APPCACHE_APPCACHE_DATABASE_H_
+#ifndef CONTENT_BROWSER_APPCACHE_APPCACHE_DATABASE_H_
+#define CONTENT_BROWSER_APPCACHE_APPCACHE_DATABASE_H_
 
 #include <map>
 #include <set>
@@ -14,9 +14,9 @@
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
+#include "content/common/appcache_interfaces.h"
+#include "content/common/content_export.h"
 #include "url/gurl.h"
-#include "webkit/browser/webkit_storage_browser_export.h"
-#include "webkit/common/appcache/appcache_interfaces.h"
 
 namespace sql {
 class Connection;
@@ -44,11 +44,11 @@ class AppCacheDatabaseTest;
 class AppCacheStorageImplTest;
 }
 
-namespace appcache {
+namespace content {
 
-class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheDatabase {
+class CONTENT_EXPORT AppCacheDatabase {
  public:
-  struct WEBKIT_STORAGE_BROWSER_EXPORT GroupRecord {
+  struct CONTENT_EXPORT GroupRecord {
     GroupRecord();
     ~GroupRecord();
 
@@ -59,7 +59,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheDatabase {
     base::Time last_access_time;
   };
 
-  struct WEBKIT_STORAGE_BROWSER_EXPORT CacheRecord {
+  struct CONTENT_EXPORT CacheRecord {
     CacheRecord()
         : cache_id(0), group_id(0), online_wildcard(false), cache_size(0) {}
 
@@ -80,13 +80,13 @@ class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheDatabase {
     int64 response_size;
   };
 
-  struct WEBKIT_STORAGE_BROWSER_EXPORT NamespaceRecord {
+  struct CONTENT_EXPORT NamespaceRecord {
     NamespaceRecord();
     ~NamespaceRecord();
 
     int64 cache_id;
     GURL origin;
-    Namespace namespace_;
+    AppCacheNamespace namespace_;
   };
 
   typedef std::vector<NamespaceRecord> NamespaceRecordVector;
@@ -249,6 +249,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheDatabase {
   DISALLOW_COPY_AND_ASSIGN(AppCacheDatabase);
 };
 
-}  // namespace appcache
+}  // namespace content
 
-#endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_DATABASE_H_
+#endif  // CONTENT_BROWSER_APPCACHE_APPCACHE_DATABASE_H_