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

webkit/appcache/appcache_service.h

Index: webkit/appcache/appcache_service.h
diff --git a/webkit/appcache/appcache_service.h b/webkit/appcache/appcache_service.h
index 114a2850328f92920d8ac7ceaea4209eb3880657..dfc7302999fe648a1d832988a8e7ee039f3c878b 100644
--- a/webkit/appcache/appcache_service.h
+++ b/webkit/appcache/appcache_service.h
@@ -13,9 +13,9 @@
 #include "base/memory/scoped_ptr.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
-#include "webkit/appcache/appcache_export.h"
 #include "webkit/appcache/appcache_interfaces.h"
 #include "webkit/appcache/appcache_storage.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 class FilePath;
 
@@ -39,7 +39,7 @@ class AppCacheQuotaClient;
 class AppCachePolicy;
 
 // Refcounted container to avoid copying the collection in callbacks.
-struct APPCACHE_EXPORT AppCacheInfoCollection
+struct WEBKIT_STORAGE_EXPORT AppCacheInfoCollection
     : public base::RefCountedThreadSafe<AppCacheInfoCollection> {
   AppCacheInfoCollection();
 
@@ -53,7 +53,7 @@ struct APPCACHE_EXPORT AppCacheInfoCollection
 // Class that manages the application cache service. Sends notifications
 // to many frontends.  One instance per user-profile. Each instance has
 // exclusive access to its cache_directory on disk.
-class APPCACHE_EXPORT AppCacheService {
+class WEBKIT_STORAGE_EXPORT AppCacheService {
  public:
   // If not using quota management, the proxy may be NULL.
   explicit AppCacheService(quota::QuotaManagerProxy* quota_manager_proxy);