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

webkit/appcache/appcache_database.h

Index: webkit/appcache/appcache_database.h
diff --git a/webkit/appcache/appcache_database.h b/webkit/appcache/appcache_database.h
index 537d5fcee394bbecf6a06745ff0e8aa1eba7ac49..5fe74a46659e64253dfe38ab9465e7a20b9ec093 100644
--- a/webkit/appcache/appcache_database.h
+++ b/webkit/appcache/appcache_database.h
@@ -15,8 +15,8 @@
 #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;
@@ -27,9 +27,9 @@ 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();
 
@@ -40,7 +40,7 @@ class APPCACHE_EXPORT AppCacheDatabase {
     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) {}
 
@@ -61,7 +61,7 @@ class APPCACHE_EXPORT AppCacheDatabase {
     int64 response_size;
   };
 
-  struct APPCACHE_EXPORT NamespaceRecord {
+  struct WEBKIT_STORAGE_EXPORT NamespaceRecord {
     NamespaceRecord();
     ~NamespaceRecord();