webkit: Merge build target 'appcache' to 'webkit_storage'

webkit/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_APPCACHE_APPCACHE_DATABASE_H_
 #define WEBKIT_APPCACHE_APPCACHE_DATABASE_H_
 
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
-#include "webkit/appcache/appcache_export.h"
 #include "webkit/appcache/appcache_interfaces.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace sql {
 class Connection;
 class MetaTable;
 class Statement;
 class StatementID;
 }
 
 namespace appcache {
 
-class APPCACHE_EXPORT AppCacheDatabase {
+class WEBKIT_STORAGE_EXPORT AppCacheDatabase {
  public:
-  struct APPCACHE_EXPORT GroupRecord {
+  struct WEBKIT_STORAGE_EXPORT GroupRecord {
     GroupRecord();
     ~GroupRecord();
 
     int64 group_id;
     GURL origin;
     GURL manifest_url;
     base::Time creation_time;
     base::Time last_access_time;
   };
 
-  struct APPCACHE_EXPORT CacheRecord {
+  struct WEBKIT_STORAGE_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 APPCACHE_EXPORT NamespaceRecord {
+  struct WEBKIT_STORAGE_EXPORT NamespaceRecord {
     NamespaceRecord();
     ~NamespaceRecord();
 
     int64 cache_id;
     GURL origin;
     NamespaceType type;
     GURL namespace_url;
     GURL target_url;
   };
 
@@ skipping 141 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(AppCacheDatabaseTest, DeletableResponseIds);
   FRIEND_TEST_ALL_PREFIXES(AppCacheDatabaseTest, OriginUsage);
   FRIEND_TEST_ALL_PREFIXES(AppCacheDatabaseTest, UpgradeSchema3to4);
 
   DISALLOW_COPY_AND_ASSIGN(AppCacheDatabase);
 };
 
 }  // namespace appcache
 
 #endif  // WEBKIT_APPCACHE_APPCACHE_DATABASE_H_