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

webkit/appcache/appcache_storage_impl.h

Index: webkit/appcache/appcache_storage_impl.h
diff --git a/webkit/appcache/appcache_storage_impl.h b/webkit/appcache/appcache_storage_impl.h
index b01ad89ca60aea5c3344505e0a694e8384746c95..4fb9a2fe1ec63db017429388ea82760ffa74fdae 100644
--- a/webkit/appcache/appcache_storage_impl.h
+++ b/webkit/appcache/appcache_storage_impl.h
@@ -17,8 +17,8 @@
 #include "base/message_loop_proxy.h"
 #include "webkit/appcache/appcache_database.h"
 #include "webkit/appcache/appcache_disk_cache.h"
-#include "webkit/appcache/appcache_export.h"
 #include "webkit/appcache/appcache_storage.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace appcache {
 
@@ -127,7 +127,7 @@ class AppCacheStorageImpl : public AppCacheStorage {
       const GURL& namespace_entry_url, const AppCacheEntry& fallback_entry,
       int64 cache_id, int64 group_id, const GURL& manifest_url);
 
-  APPCACHE_EXPORT AppCacheDiskCache* disk_cache();
+  WEBKIT_STORAGE_EXPORT AppCacheDiskCache* disk_cache();
 
   // The directory in which we place files in the file system.
   FilePath cache_directory_;