Move all remaining appcache-related code to content namespace

content/browser/appcache/appcache_database.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #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;
 class MetaTable;
 class Statement;
 class StatementID;
 }
 
 namespace content {
 FORWARD_DECLARE_TEST(AppCacheDatabaseTest, CacheRecords);
 FORWARD_DECLARE_TEST(AppCacheDatabaseTest, EntryRecords);
 FORWARD_DECLARE_TEST(AppCacheDatabaseTest, QuickIntegrityCheck);
 FORWARD_DECLARE_TEST(AppCacheDatabaseTest, NamespaceRecords);
 FORWARD_DECLARE_TEST(AppCacheDatabaseTest, GroupRecords);
 FORWARD_DECLARE_TEST(AppCacheDatabaseTest, LazyOpen);
 FORWARD_DECLARE_TEST(AppCacheDatabaseTest, ExperimentalFlags);
 FORWARD_DECLARE_TEST(AppCacheDatabaseTest, OnlineWhiteListRecords);
 FORWARD_DECLARE_TEST(AppCacheDatabaseTest, ReCreate);
 FORWARD_DECLARE_TEST(AppCacheDatabaseTest, DeletableResponseIds);
 FORWARD_DECLARE_TEST(AppCacheDatabaseTest, OriginUsage);
 FORWARD_DECLARE_TEST(AppCacheDatabaseTest, UpgradeSchema3to5);
 FORWARD_DECLARE_TEST(AppCacheDatabaseTest, UpgradeSchema4to5);
 FORWARD_DECLARE_TEST(AppCacheDatabaseTest, WasCorrutionDetected);
 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();
 
     int64 group_id;
     GURL origin;
     GURL manifest_url;
     base::Time creation_time;
     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) {}
 
     int64 cache_id;
     int64 group_id;
     bool online_wildcard;
     base::Time update_time;
     int64 cache_size;  // the sum of all response sizes in this cache
   };
 
   struct EntryRecord {
     EntryRecord() : cache_id(0), flags(0), response_id(0), response_size(0) {}
 
     int64 cache_id;
     GURL url;
     int flags;
     int64 response_id;
     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;
 
   struct OnlineWhiteListRecord {
     OnlineWhiteListRecord() : cache_id(0), is_pattern(false) {}
 
     int64 cache_id;
     GURL namespace_url;
     bool is_pattern;
@@ skipping 142 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheDatabaseTest, ReCreate);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheDatabaseTest, DeletableResponseIds);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheDatabaseTest, OriginUsage);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheDatabaseTest, UpgradeSchema3to5);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheDatabaseTest, UpgradeSchema4to5);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheDatabaseTest, WasCorrutionDetected);
 
   DISALLOW_COPY_AND_ASSIGN(AppCacheDatabase);
 };
 
-}  // namespace appcache
+}  // namespace content
 
-#endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_DATABASE_H_
+#endif  // CONTENT_BROWSER_APPCACHE_APPCACHE_DATABASE_H_