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

webkit/appcache/appcache_host.h

Index: webkit/appcache/appcache_host.h
diff --git a/webkit/appcache/appcache_host.h b/webkit/appcache/appcache_host.h
index 172d74044a6bd55670f6427835b4fd94bd252a56..c4dc793d9d2f7c6624f0d04efa4f85f88ee005ed 100644
--- a/webkit/appcache/appcache_host.h
+++ b/webkit/appcache/appcache_host.h
@@ -12,10 +12,10 @@
 #include "googleurl/src/gurl.h"
 #include "webkit/appcache/appcache_group.h"
 #include "webkit/appcache/appcache_interfaces.h"
-#include "webkit/appcache/appcache_export.h"
 #include "webkit/appcache/appcache_service.h"
 #include "webkit/appcache/appcache_storage.h"
 #include "webkit/glue/resource_type.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace net {
 class URLRequest;
@@ -32,11 +32,12 @@ typedef base::Callback<void(bool, void*)> StartUpdateCallback;
 typedef base::Callback<void(bool, void*)> SwapCacheCallback;
 
 // Server-side representation of an application cache host.
-class APPCACHE_EXPORT AppCacheHost : public AppCacheStorage::Delegate,
-                                     public AppCacheGroup::UpdateObserver {
+class WEBKIT_STORAGE_EXPORT AppCacheHost
+    : public AppCacheStorage::Delegate,
+      public AppCacheGroup::UpdateObserver {
  public:
 
-  class APPCACHE_EXPORT Observer {
+  class WEBKIT_STORAGE_EXPORT Observer {
    public:
     // Called just after the cache selection algorithm completes.
     virtual void OnCacheSelectionComplete(AppCacheHost* host) = 0;