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

BUG=155242
TEST=build

TBR=darin@chromium.org for trivial gyp changes


Review URL: https://chromiumcodereview.appspot.com/11230022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163491 0039d316-1c4b-4281-b951-d872f2087c98

32 files changed, 128 insertions, 192 deletions

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index d365e6a..9dbf661 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -72,7 +72,6 @@
         '../ui/ui.gyp:ui_resources',
         '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
         '../v8/tools/gyp/v8.gyp:v8',
-        '../webkit/support/webkit_support.gyp:appcache',
         '../webkit/support/webkit_support.gyp:database',
         '../webkit/support/webkit_support.gyp:glue',
         '../webkit/support/webkit_support.gyp:quota',
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index 32c3289..a127aec 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -91,7 +91,6 @@
         '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
         '../v8/tools/gyp/v8.gyp:v8',
         '../ui/views/controls/webview/webview.gyp:webview',
-        '../webkit/support/webkit_support.gyp:appcache',
         '../webkit/support/webkit_support.gyp:database',
         '../webkit/support/webkit_support.gyp:glue',
         '../webkit/support/webkit_support.gyp:quota',
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index 8093118..8359406 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -44,7 +44,6 @@
         '../ui/base/strings/ui_strings.gyp:ui_strings',
         '../ui/ui.gyp:ui',
         '../ui/ui.gyp:ui_resources',
-        '../webkit/support/webkit_support.gyp:appcache',
         '../webkit/support/webkit_support.gyp:database',
         '../webkit/support/webkit_support.gyp:glue',
         '../webkit/support/webkit_support.gyp:quota',
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 21cab93..d48228b 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -73,7 +73,6 @@
         '../ui/ui.gyp:ui_resources',
         '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
         '../v8/tools/gyp/v8.gyp:v8',
-        '../webkit/support/webkit_support.gyp:appcache',
         '../webkit/support/webkit_support.gyp:database',
         '../webkit/support/webkit_support.gyp:glue',
         '../webkit/support/webkit_support.gyp:quota',
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 02cfc46..16db3cb 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -416,7 +416,6 @@
         '../third_party/npapi/npapi.gyp:npapi',
         '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
         '../ui/gl/gl.gyp:gl',
-        '../webkit/support/webkit_support.gyp:appcache',
         '../webkit/support/webkit_support.gyp:database',
         '../webkit/support/webkit_support.gyp:webkit_base',
         '../webkit/support/webkit_support.gyp:webkit_storage',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 5df061e..d8f6ce5 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -166,7 +166,7 @@
             '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
             '../ui/surface/surface.gyp:surface',
             '../webkit/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
-            '../webkit/support/webkit_support.gyp:appcache',
+            '../webkit/support/webkit_support.gyp:webkit_storage',
           ],
         }],
         ['OS == "win" or (toolkit_uses_gtk == 1 and selinux == 0)', {
@@ -496,7 +496,6 @@
             '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
             '../ui/gl/gl.gyp:gl',
             '../v8/tools/gyp/v8.gyp:v8',
-            '../webkit/support/webkit_support.gyp:appcache',
             '../webkit/support/webkit_support.gyp:database',
             '../webkit/support/webkit_support.gyp:dom_storage',
             '../webkit/support/webkit_support.gyp:glue',
diff --git a/webkit/appcache/appcache.h b/webkit/appcache/appcache.h
index b4905dc..feafc0e 100644
--- a/webkit/appcache/appcache.h
+++ b/webkit/appcache/appcache.h
@@ -15,8 +15,8 @@
 #include "googleurl/src/gurl.h"
 #include "webkit/appcache/appcache_database.h"
 #include "webkit/appcache/appcache_entry.h"
-#include "webkit/appcache/appcache_export.h"
 #include "webkit/appcache/manifest_parser.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace appcache {
 
@@ -27,7 +27,7 @@ class AppCacheService;
 // Set of cached resources for an application. A cache exists as long as a
 // host is associated with it, the cache is in an appcache group or the
 // cache is being created during an appcache upate.
-class APPCACHE_EXPORT AppCache : public base::RefCounted<AppCache> {
+class WEBKIT_STORAGE_EXPORT AppCache : public base::RefCounted<AppCache> {
  public:
   typedef std::map<GURL, AppCacheEntry> EntryMap;
   typedef std::set<AppCacheHost*> AppCacheHosts;
diff --git a/webkit/appcache/appcache_backend_impl.h b/webkit/appcache/appcache_backend_impl.h
index 0f81791..1731c64 100644
--- a/webkit/appcache/appcache_backend_impl.h
+++ b/webkit/appcache/appcache_backend_impl.h
@@ -6,14 +6,14 @@
 #define WEBKIT_APPCACHE_APPCACHE_BACKEND_IMPL_H_
 
 #include "base/hash_tables.h"
-#include "webkit/appcache/appcache_export.h"
 #include "webkit/appcache/appcache_host.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace appcache {
 
 class AppCacheService;
 
-class APPCACHE_EXPORT AppCacheBackendImpl {
+class WEBKIT_STORAGE_EXPORT AppCacheBackendImpl {
  public:
   AppCacheBackendImpl();
   ~AppCacheBackendImpl();
diff --git a/webkit/appcache/appcache_database.h b/webkit/appcache/appcache_database.h
index 537d5fc..5fe74a4 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();
 
diff --git a/webkit/appcache/appcache_disk_cache.h b/webkit/appcache/appcache_disk_cache.h
index 27e8905..529db97 100644
--- a/webkit/appcache/appcache_disk_cache.h
+++ b/webkit/appcache/appcache_disk_cache.h
@@ -10,14 +10,14 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "net/disk_cache/disk_cache.h"
-#include "webkit/appcache/appcache_export.h"
 #include "webkit/appcache/appcache_response.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace appcache {
 
 // An implementation of AppCacheDiskCacheInterface that
 // uses net::DiskCache as the backing store.
-class APPCACHE_EXPORT AppCacheDiskCache
+class WEBKIT_STORAGE_EXPORT AppCacheDiskCache
     : public AppCacheDiskCacheInterface {
  public:
   AppCacheDiskCache();
diff --git a/webkit/appcache/appcache_export.h b/webkit/appcache/appcache_export.h
deleted file mode 100644
index f6892f2..0000000
--- a/webkit/appcache/appcache_export.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2011 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_EXPORT_H_
-#define WEBKIT_APPCACHE_APPCACHE_EXPORT_H_
-
-#if defined(COMPONENT_BUILD)
-#if defined(WIN32)
-
-#if defined(APPCACHE_IMPLEMENTATION)
-#define APPCACHE_EXPORT __declspec(dllexport)
-#else
-#define APPCACHE_EXPORT __declspec(dllimport)
-#endif  // defined(APPCACHE_IMPLEMENTATION)
-
-#else // defined(WIN32)
-#if defined(APPCACHE_IMPLEMENTATION)
-#define APPCACHE_EXPORT __attribute__((visibility("default")))
-#else
-#define APPCACHE_EXPORT
-#endif
-#endif
-
-#else // defined(COMPONENT_BUILD)
-#define APPCACHE_EXPORT
-#endif
-
-#endif  // WEBKIT_APPCACHE_APPCACHE_EXPORT_H_
diff --git a/webkit/appcache/appcache_frontend_impl.h b/webkit/appcache/appcache_frontend_impl.h
index 7c28eab..0f20db4 100644
--- a/webkit/appcache/appcache_frontend_impl.h
+++ b/webkit/appcache/appcache_frontend_impl.h
@@ -7,12 +7,12 @@
 
 #include <string>
 #include <vector>
-#include "webkit/appcache/appcache_export.h"
 #include "webkit/appcache/appcache_interfaces.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace appcache {
 
-class APPCACHE_EXPORT AppCacheFrontendImpl : public AppCacheFrontend {
+class WEBKIT_STORAGE_EXPORT AppCacheFrontendImpl : public AppCacheFrontend {
  public:
   virtual void OnCacheSelected(
       int host_id, const appcache::AppCacheInfo& info) OVERRIDE;
diff --git a/webkit/appcache/appcache_group.h b/webkit/appcache/appcache_group.h
index 776a4b7..af2619b 100644
--- a/webkit/appcache/appcache_group.h
+++ b/webkit/appcache/appcache_group.h
@@ -15,7 +15,7 @@
 #include "base/observer_list.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
-#include "webkit/appcache/appcache_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace appcache {
 
@@ -27,10 +27,11 @@ class HostObserver;
 
 // Collection of application caches identified by the same manifest URL.
 // A group exists as long as it is in use by a host or is being updated.
-class APPCACHE_EXPORT AppCacheGroup : public base::RefCounted<AppCacheGroup> {
+class WEBKIT_STORAGE_EXPORT AppCacheGroup
+    : public base::RefCounted<AppCacheGroup> {
  public:
 
-  class APPCACHE_EXPORT UpdateObserver {
+  class WEBKIT_STORAGE_EXPORT UpdateObserver {
     public:
       // Called just after an appcache update has completed.
       virtual void OnUpdateComplete(AppCacheGroup* group) = 0;
diff --git a/webkit/appcache/appcache_host.h b/webkit/appcache/appcache_host.h
index 172d740..c4dc793 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;
diff --git a/webkit/appcache/appcache_interceptor.h b/webkit/appcache/appcache_interceptor.h
index 1bbe121..29ad738 100644
--- a/webkit/appcache/appcache_interceptor.h
+++ b/webkit/appcache/appcache_interceptor.h
@@ -8,8 +8,8 @@
 #include "base/memory/singleton.h"
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_request.h"
-#include "webkit/appcache/appcache_export.h"
 #include "webkit/glue/resource_type.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace appcache {
 
@@ -18,7 +18,7 @@ class AppCacheService;
 
 // An interceptor to hijack requests and potentially service them out of
 // the appcache.
-class APPCACHE_EXPORT AppCacheInterceptor
+class WEBKIT_STORAGE_EXPORT AppCacheInterceptor
     : public net::URLRequest::Interceptor {
  public:
   // Registers a singleton instance with the net library.
diff --git a/webkit/appcache/appcache_interfaces.h b/webkit/appcache/appcache_interfaces.h
index c9ade5b..ed1dee7 100644
--- a/webkit/appcache/appcache_interfaces.h
+++ b/webkit/appcache/appcache_interfaces.h
@@ -11,7 +11,7 @@
 #include "base/file_path.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
-#include "webkit/appcache/appcache_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace net {
 class URLRequest;
@@ -59,7 +59,7 @@ enum NamespaceType {
   INTERCEPT_NAMESPACE
 };
 
-struct APPCACHE_EXPORT AppCacheInfo {
+struct WEBKIT_STORAGE_EXPORT AppCacheInfo {
   AppCacheInfo();
   ~AppCacheInfo();
 
@@ -77,7 +77,7 @@ struct APPCACHE_EXPORT AppCacheInfo {
 typedef std::vector<AppCacheInfo> AppCacheInfoVector;
 
 // Type to hold information about a single appcache resource.
-struct APPCACHE_EXPORT AppCacheResourceInfo {
+struct WEBKIT_STORAGE_EXPORT AppCacheResourceInfo {
   AppCacheResourceInfo();
   ~AppCacheResourceInfo();
 
@@ -94,7 +94,7 @@ struct APPCACHE_EXPORT AppCacheResourceInfo {
 
 typedef std::vector<AppCacheResourceInfo> AppCacheResourceInfoVector;
 
-struct APPCACHE_EXPORT Namespace {
+struct WEBKIT_STORAGE_EXPORT Namespace {
   Namespace();  // Type is set to FALLBACK_NAMESPACE by default.
   Namespace(NamespaceType type, const GURL& url, const GURL& target);
   ~Namespace();
@@ -107,7 +107,7 @@ struct APPCACHE_EXPORT Namespace {
 typedef std::vector<Namespace> NamespaceVector;
 
 // Interface used by backend (browser-process) to talk to frontend (renderer).
-class APPCACHE_EXPORT AppCacheFrontend {
+class WEBKIT_STORAGE_EXPORT AppCacheFrontend {
  public:
   virtual void OnCacheSelected(
       int host_id, const appcache::AppCacheInfo& info) = 0;
@@ -128,7 +128,7 @@ class APPCACHE_EXPORT AppCacheFrontend {
 };
 
 // Interface used by frontend (renderer) to talk to backend (browser-process).
-class APPCACHE_EXPORT AppCacheBackend {
+class WEBKIT_STORAGE_EXPORT AppCacheBackend {
  public:
   virtual void RegisterHost(int host_id) = 0;
   virtual void UnregisterHost(int host_id) = 0;
@@ -169,7 +169,7 @@ bool IsSchemeSupported(const GURL& url);
 bool IsMethodSupported(const std::string& method);
 bool IsSchemeAndMethodSupported(const net::URLRequest* request);
 
-APPCACHE_EXPORT extern const FilePath::CharType kAppCacheDatabaseName[];
+WEBKIT_STORAGE_EXPORT extern const FilePath::CharType kAppCacheDatabaseName[];
 
 }  // namespace
 
diff --git a/webkit/appcache/appcache_quota_client.h b/webkit/appcache/appcache_quota_client.h
index 705ab6d..0993141 100644
--- a/webkit/appcache/appcache_quota_client.h
+++ b/webkit/appcache/appcache_quota_client.h
@@ -13,11 +13,11 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/completion_callback.h"
-#include "webkit/appcache/appcache_export.h"
 #include "webkit/appcache/appcache_storage.h"
 #include "webkit/quota/quota_client.h"
 #include "webkit/quota/quota_task.h"
 #include "webkit/quota/quota_types.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace appcache {
 
@@ -56,7 +56,7 @@ class AppCacheQuotaClient : public quota::QuotaClient {
   friend class AppCacheStorageImpl;  // for NotifyAppCacheIsReady
   friend class AppCacheQuotaClientTest;
 
-  APPCACHE_EXPORT explicit AppCacheQuotaClient(AppCacheService* service);
+  WEBKIT_STORAGE_EXPORT explicit AppCacheQuotaClient(AppCacheService* service);
 
   void DidDeleteAppCachesForOrigin(int rv);
   void GetOriginsHelper(quota::StorageType type,
@@ -68,8 +68,8 @@ class AppCacheQuotaClient : public quota::QuotaClient {
   net::CancelableCompletionCallback* GetServiceDeleteCallback();
 
   // For use by appcache internals during initialization and shutdown.
-  APPCACHE_EXPORT void NotifyAppCacheReady();
-  APPCACHE_EXPORT void NotifyAppCacheDestroyed();
+  WEBKIT_STORAGE_EXPORT void NotifyAppCacheReady();
+  WEBKIT_STORAGE_EXPORT void NotifyAppCacheDestroyed();
 
   // Prior to appcache service being ready, we have to queue
   // up reqeusts and defer acting on them until we're ready.
diff --git a/webkit/appcache/appcache_request_handler.h b/webkit/appcache/appcache_request_handler.h
index d77f150..42adb70 100644
--- a/webkit/appcache/appcache_request_handler.h
+++ b/webkit/appcache/appcache_request_handler.h
@@ -8,9 +8,9 @@
 #include "base/compiler_specific.h"
 #include "base/supports_user_data.h"
 #include "webkit/appcache/appcache_entry.h"
-#include "webkit/appcache/appcache_export.h"
 #include "webkit/appcache/appcache_host.h"
 #include "webkit/glue/resource_type.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace net {
 class NetworkDelegate;
@@ -27,7 +27,7 @@ class AppCacheURLRequestJob;
 // given the opportunity to hijack the request along the way. Callers
 // should use AppCacheHost::CreateRequestHandler to manufacture instances
 // that can retrieve resources for a particular host.
-class APPCACHE_EXPORT AppCacheRequestHandler
+class WEBKIT_STORAGE_EXPORT AppCacheRequestHandler
     : public base::SupportsUserData::Data,
       public AppCacheHost::Observer,
       public AppCacheStorage::Delegate  {
diff --git a/webkit/appcache/appcache_response.h b/webkit/appcache/appcache_response.h
index 9de19f2..7d5db3a 100644
--- a/webkit/appcache/appcache_response.h
+++ b/webkit/appcache/appcache_response.h
@@ -26,7 +26,7 @@ static const int kUnkownResponseDataSize = -1;
 
 // Response info for a particular response id. Instances are tracked in
 // the working set.
-class APPCACHE_EXPORT AppCacheResponseInfo
+class WEBKIT_STORAGE_EXPORT AppCacheResponseInfo
     : public base::RefCounted<AppCacheResponseInfo> {
  public:
   // AppCacheResponseInfo takes ownership of the http_info.
@@ -54,7 +54,7 @@ class APPCACHE_EXPORT AppCacheResponseInfo
 
 // A refcounted wrapper for HttpResponseInfo so we can apply the
 // refcounting semantics used with IOBuffer with these structures too.
-struct APPCACHE_EXPORT HttpResponseInfoIOBuffer
+struct WEBKIT_STORAGE_EXPORT HttpResponseInfoIOBuffer
     : public base::RefCountedThreadSafe<HttpResponseInfoIOBuffer> {
   scoped_ptr<net::HttpResponseInfo> http_info;
   int response_data_size;
@@ -68,7 +68,7 @@ struct APPCACHE_EXPORT HttpResponseInfoIOBuffer
 };
 
 // Low level storage API used by the response reader and writer.
-class APPCACHE_EXPORT AppCacheDiskCacheInterface {
+class WEBKIT_STORAGE_EXPORT AppCacheDiskCacheInterface {
  public:
   class Entry {
    public:
@@ -94,7 +94,7 @@ class APPCACHE_EXPORT AppCacheDiskCacheInterface {
 };
 
 // Common base class for response reader and writer.
-class APPCACHE_EXPORT AppCacheResponseIO {
+class WEBKIT_STORAGE_EXPORT AppCacheResponseIO {
  public:
   virtual ~AppCacheResponseIO();
   int64 response_id() const { return response_id_; }
@@ -130,7 +130,7 @@ class APPCACHE_EXPORT AppCacheResponseIO {
 // and there is a read in progress, the implementation will return
 // immediately but will take care of any side effect of cancelling the
 // operation.  In other words, instances are safe to delete at will.
-class APPCACHE_EXPORT AppCacheResponseReader : public AppCacheResponseIO {
+class WEBKIT_STORAGE_EXPORT AppCacheResponseReader : public AppCacheResponseIO {
  public:
   virtual ~AppCacheResponseReader();
 
@@ -192,7 +192,7 @@ class APPCACHE_EXPORT AppCacheResponseReader : public AppCacheResponseIO {
 // and there is a write in progress, the implementation will return
 // immediately but will take care of any side effect of cancelling the
 // operation. In other words, instances are safe to delete at will.
-class APPCACHE_EXPORT AppCacheResponseWriter : public AppCacheResponseIO {
+class WEBKIT_STORAGE_EXPORT AppCacheResponseWriter : public AppCacheResponseIO {
  public:
   virtual ~AppCacheResponseWriter();
 
diff --git a/webkit/appcache/appcache_service.h b/webkit/appcache/appcache_service.h
index 114a285..dfc7302 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);
diff --git a/webkit/appcache/appcache_storage.h b/webkit/appcache/appcache_storage.h
index c04315b..20ca319 100644
--- a/webkit/appcache/appcache_storage.h
+++ b/webkit/appcache/appcache_storage.h
@@ -8,14 +8,14 @@
 #include <map>
 #include <vector>
 
-#include "base/compiler_specific.h"
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/completion_callback.h"
-#include "webkit/appcache/appcache_export.h"
 #include "webkit/appcache/appcache_working_set.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 class GURL;
 
@@ -30,11 +30,11 @@ class AppCacheService;
 struct AppCacheInfoCollection;
 struct HttpResponseInfoIOBuffer;
 
-class APPCACHE_EXPORT AppCacheStorage {
+class WEBKIT_STORAGE_EXPORT AppCacheStorage {
  public:
   typedef std::map<GURL, int64> UsageMap;
 
-  class APPCACHE_EXPORT Delegate {
+  class WEBKIT_STORAGE_EXPORT Delegate {
    public:
     // If retrieval fails, 'collection' will be NULL.
     virtual void OnAllInfo(AppCacheInfoCollection* collection) {}
diff --git a/webkit/appcache/appcache_storage_impl.h b/webkit/appcache/appcache_storage_impl.h
index b01ad89c..4fb9a2f 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_;
diff --git a/webkit/appcache/appcache_update_job.h b/webkit/appcache/appcache_update_job.h
index 7d34448..7c250b5 100644
--- a/webkit/appcache/appcache_update_job.h
+++ b/webkit/appcache/appcache_update_job.h
@@ -18,19 +18,20 @@
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
 #include "webkit/appcache/appcache.h"
-#include "webkit/appcache/appcache_export.h"
 #include "webkit/appcache/appcache_host.h"
 #include "webkit/appcache/appcache_interfaces.h"
 #include "webkit/appcache/appcache_response.h"
 #include "webkit/appcache/appcache_storage.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace appcache {
 
 class HostNotifier;
 
 // Application cache Update algorithm and state.
-class APPCACHE_EXPORT AppCacheUpdateJob : public AppCacheStorage::Delegate,
-                                          public AppCacheHost::Observer {
+class WEBKIT_STORAGE_EXPORT AppCacheUpdateJob
+    : public AppCacheStorage::Delegate,
+      public AppCacheHost::Observer {
  public:
   AppCacheUpdateJob(AppCacheService* service, AppCacheGroup* group);
   virtual ~AppCacheUpdateJob();
diff --git a/webkit/appcache/appcache_url_request_job.h b/webkit/appcache/appcache_url_request_job.h
index 38ee9bd..67919b6 100644
--- a/webkit/appcache/appcache_url_request_job.h
+++ b/webkit/appcache/appcache_url_request_job.h
@@ -11,16 +11,17 @@
 #include "net/http/http_byte_range.h"
 #include "net/url_request/url_request_job.h"
 #include "webkit/appcache/appcache_entry.h"
-#include "webkit/appcache/appcache_export.h"
 #include "webkit/appcache/appcache_response.h"
 #include "webkit/appcache/appcache_storage.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace appcache {
 
 // A net::URLRequestJob derivative that knows how to return a response stored
 // in the appcache.
-class APPCACHE_EXPORT AppCacheURLRequestJob : public net::URLRequestJob,
-                                              public AppCacheStorage::Delegate {
+class WEBKIT_STORAGE_EXPORT AppCacheURLRequestJob
+    : public net::URLRequestJob,
+      public AppCacheStorage::Delegate {
  public:
   AppCacheURLRequestJob(net::URLRequest* request,
                         net::NetworkDelegate* network_delegate,
diff --git a/webkit/appcache/appcache_working_set.h b/webkit/appcache/appcache_working_set.h
index 638b562..dcb2716 100644
--- a/webkit/appcache/appcache_working_set.h
+++ b/webkit/appcache/appcache_working_set.h
@@ -9,7 +9,7 @@
 
 #include "base/hash_tables.h"
 #include "googleurl/src/gurl.h"
-#include "webkit/appcache/appcache_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace appcache {
 
@@ -19,7 +19,7 @@ class AppCacheResponseInfo;
 
 // Represents the working set of appcache object instances
 // currently in memory.
-class APPCACHE_EXPORT AppCacheWorkingSet {
+class WEBKIT_STORAGE_EXPORT AppCacheWorkingSet {
  public:
   typedef std::map<GURL, AppCacheGroup*> GroupMap;
 
diff --git a/webkit/appcache/manifest_parser.h b/webkit/appcache/manifest_parser.h
index a612e6a..47ebe77 100644
--- a/webkit/appcache/manifest_parser.h
+++ b/webkit/appcache/manifest_parser.h
@@ -36,14 +36,14 @@
 #include <vector>
 
 #include "base/hash_tables.h"
-#include "webkit/appcache/appcache_export.h"
 #include "webkit/appcache/appcache_interfaces.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 class GURL;
 
 namespace appcache {
 
-struct APPCACHE_EXPORT Manifest {
+struct WEBKIT_STORAGE_EXPORT Manifest {
   Manifest();
   ~Manifest();
 
@@ -54,10 +54,10 @@ struct APPCACHE_EXPORT Manifest {
   bool online_whitelist_all;
 };
 
-APPCACHE_EXPORT bool ParseManifest(const GURL& manifest_url,
-                                   const char* data,
-                                   int length,
-                                   Manifest& manifest);
+WEBKIT_STORAGE_EXPORT bool ParseManifest(const GURL& manifest_url,
+                                         const char* data,
+                                         int length,
+                                         Manifest& manifest);
 
 }  // namespace appcache
 
diff --git a/webkit/appcache/view_appcache_internals_job.h b/webkit/appcache/view_appcache_internals_job.h
index aad961f..e51ada1 100644
--- a/webkit/appcache/view_appcache_internals_job.h
+++ b/webkit/appcache/view_appcache_internals_job.h
@@ -6,7 +6,7 @@
 #define WEBKIT_APPCACHE_VIEW_APPCACHE_INTERNALS_JOB_H_
 
 #include "base/basictypes.h"
-#include "webkit/appcache/appcache_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace net {
 class NetworkDelegate;
@@ -18,7 +18,7 @@ namespace appcache {
 
 class AppCacheService;
 
-class APPCACHE_EXPORT ViewAppCacheInternalsJobFactory {
+class WEBKIT_STORAGE_EXPORT ViewAppCacheInternalsJobFactory {
  public:
   static net::URLRequestJob* CreateJobForRequest(
       net::URLRequest* request,
diff --git a/webkit/appcache/web_application_cache_host_impl.h b/webkit/appcache/web_application_cache_host_impl.h
index 39e3b2a..216594d 100644
--- a/webkit/appcache/web_application_cache_host_impl.h
+++ b/webkit/appcache/web_application_cache_host_impl.h
@@ -8,11 +8,11 @@
 #include <string>
 
 #include "googleurl/src/gurl.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebApplicationCacheHostClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLResponse.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
-#include "webkit/appcache/appcache_export.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebApplicationCacheHostClient.h"
 #include "webkit/appcache/appcache_interfaces.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace WebKit {
 class WebFrame;
@@ -20,7 +20,7 @@ class WebFrame;
 
 namespace appcache {
 
-class APPCACHE_EXPORT WebApplicationCacheHostImpl
+class WEBKIT_STORAGE_EXPORT WebApplicationCacheHostImpl
     : NON_EXPORTED_BASE(public WebKit::WebApplicationCacheHost) {
  public:
   // Returns the host having given id or NULL if there is no such host.
diff --git a/webkit/appcache/webkit_appcache.gypi b/webkit/appcache/webkit_appcache.gypi
index b4c63b5..bc6a1ce 100644
--- a/webkit/appcache/webkit_appcache.gypi
+++ b/webkit/appcache/webkit_appcache.gypi
@@ -4,89 +4,55 @@
 
 {
   'variables': {
-    'conditions': [
-      ['inside_chromium_build==0', {
-        'webkit_src_dir': '../../../../..',
-      },{
-        'webkit_src_dir': '../../third_party/WebKit',
-      }],
-      ],
-    },
-  'targets': [
-    {
-      'target_name': 'appcache',
-      'variables': { 'enable_wexit_time_destructors': 1, },
-      'type': '<(component)',
-      'defines': [
-        'APPCACHE_IMPLEMENTATION',
-      ],
-      'dependencies': [
-        'quota',
-        '<(DEPTH)/base/base.gyp:base_i18n',
-        '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
-        '<(DEPTH)/net/net.gyp:net',
-        '<(DEPTH)/sql/sql.gyp:sql',
-        '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
-      ],
-      'sources': [
-        # This list contains all .h and .cc in appcache except for test code.
-        'appcache.cc',
-        'appcache.h',
-        'appcache_backend_impl.cc',
-        'appcache_backend_impl.h',
-        'appcache_database.cc',
-        'appcache_database.h',
-        'appcache_disk_cache.cc',
-        'appcache_disk_cache.h',
-        'appcache_entry.h',
-        'appcache_export.h',
-        'appcache_frontend_impl.cc',
-        'appcache_frontend_impl.h',
-        'appcache_group.cc',
-        'appcache_group.h',
-        'appcache_histograms.cc',
-        'appcache_histograms.h',
-        'appcache_host.cc',
-        'appcache_host.h',
-        'appcache_interceptor.cc',
-        'appcache_interceptor.h',
-        'appcache_interfaces.cc',
-        'appcache_interfaces.h',
-        'appcache_policy.h',
-        'appcache_quota_client.cc',
-        'appcache_quota_client.h',
-        'appcache_request_handler.cc',
-        'appcache_request_handler.h',
-        'appcache_response.cc',
-        'appcache_response.h',
-        'appcache_service.cc',
-        'appcache_service.h',
-        'appcache_storage.cc',
-        'appcache_storage.h',
-        'appcache_storage_impl.cc',
-        'appcache_storage_impl.h',
-        'appcache_working_set.cc',
-        'appcache_working_set.h',
-        'appcache_update_job.cc',
-        'appcache_update_job.h',
-        'appcache_url_request_job.cc',
-        'appcache_url_request_job.h',
-        'manifest_parser.cc',
-        'manifest_parser.h',
-        'view_appcache_internals_job.h',
-        'view_appcache_internals_job.cc',
-        'web_application_cache_host_impl.cc',
-        'web_application_cache_host_impl.h',
-        'webkit_appcache.gypi',
-      ],
-      'conditions': [
-        ['inside_chromium_build==0', {
-          'dependencies': [
-            '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
-          ],
-        }],
-      ],
-    },
-  ],
+    'webkit_appcache_sources': [
+      # This list contains all .h and .cc in appcache except for test code.
+      '../appcache/appcache.cc',
+      '../appcache/appcache.h',
+      '../appcache/appcache_backend_impl.cc',
+      '../appcache/appcache_backend_impl.h',
+      '../appcache/appcache_database.cc',
+      '../appcache/appcache_database.h',
+      '../appcache/appcache_disk_cache.cc',
+      '../appcache/appcache_disk_cache.h',
+      '../appcache/appcache_entry.h',
+      '../appcache/appcache_frontend_impl.cc',
+      '../appcache/appcache_frontend_impl.h',
+      '../appcache/appcache_group.cc',
+      '../appcache/appcache_group.h',
+      '../appcache/appcache_histograms.cc',
+      '../appcache/appcache_histograms.h',
+      '../appcache/appcache_host.cc',
+      '../appcache/appcache_host.h',
+      '../appcache/appcache_interceptor.cc',
+      '../appcache/appcache_interceptor.h',
+      '../appcache/appcache_interfaces.cc',
+      '../appcache/appcache_interfaces.h',
+      '../appcache/appcache_policy.h',
+      '../appcache/appcache_quota_client.cc',
+      '../appcache/appcache_quota_client.h',
+      '../appcache/appcache_request_handler.cc',
+      '../appcache/appcache_request_handler.h',
+      '../appcache/appcache_response.cc',
+      '../appcache/appcache_response.h',
+      '../appcache/appcache_service.cc',
+      '../appcache/appcache_service.h',
+      '../appcache/appcache_storage.cc',
+      '../appcache/appcache_storage.h',
+      '../appcache/appcache_storage_impl.cc',
+      '../appcache/appcache_storage_impl.h',
+      '../appcache/appcache_working_set.cc',
+      '../appcache/appcache_working_set.h',
+      '../appcache/appcache_update_job.cc',
+      '../appcache/appcache_update_job.h',
+      '../appcache/appcache_url_request_job.cc',
+      '../appcache/appcache_url_request_job.h',
+      '../appcache/manifest_parser.cc',
+      '../appcache/manifest_parser.h',
+      '../appcache/view_appcache_internals_job.h',
+      '../appcache/view_appcache_internals_job.cc',
+      '../appcache/web_application_cache_host_impl.cc',
+      '../appcache/web_application_cache_host_impl.h',
+      '../appcache/webkit_appcache.gypi',
+    ],
+  },
 }
diff --git a/webkit/storage/webkit_storage.gypi b/webkit/storage/webkit_storage.gypi
index ae26150..1896312 100644
--- a/webkit/storage/webkit_storage.gypi
+++ b/webkit/storage/webkit_storage.gypi
@@ -13,6 +13,7 @@
     ],
   },
   'includes': [
+    '../appcache/webkit_appcache.gypi',
     '../blob/webkit_blob.gypi',
     '../fileapi/webkit_fileapi.gypi',
   ],
@@ -27,6 +28,7 @@
         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
         '<(DEPTH)/net/net.gyp:net',
+        '<(DEPTH)/sql/sql.gyp:sql',
         '<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
         '<(DEPTH)/webkit/support/webkit_support.gyp:quota',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_base',
@@ -36,6 +38,7 @@
       'sources': [
         # TODO(hashimoto): Import all storage related modules. crbug.com/155242
         '../storage/webkit_storage_export.h',
+        '<@(webkit_appcache_sources)',
         '<@(webkit_blob_sources)',
         '<@(webkit_fileapi_sources)',
       ],
diff --git a/webkit/support/webkit_support.gypi b/webkit/support/webkit_support.gypi
index 7f7aa23..deca0c3 100644
--- a/webkit/support/webkit_support.gypi
+++ b/webkit/support/webkit_support.gypi
@@ -21,7 +21,6 @@
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(DEPTH)/third_party/hyphen/hyphen.gyp:hyphen',
         '<(DEPTH)/ui/ui.gyp:ui',
-        'appcache',
         'database',
         'dom_storage',
         'glue',
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index f5840cf..7615351 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -48,7 +48,6 @@
         '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:inspector_resources',
         '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:appcache',
         '<(DEPTH)/webkit/support/webkit_support.gyp:database',
         '<(DEPTH)/webkit/support/webkit_support.gyp:dom_storage',
         '<(DEPTH)/webkit/support/webkit_support.gyp:glue',