Revert 205463 "Split webkit_storage target into webkit_storage_{..."

Broke split_link

> Split webkit_storage target into webkit_storage_{browser,common,renderer}
> 
> This does:
> - Remove all webkit/browser/foo/*.gypi, webkit/common/foo/*.gypi for storage
> - Add three top-level gyp's in webkit/: storage_{browser,common,renderer}.gyp
> 
> storage_common and storage_renderer might be able to be subsumed in
> bigger targets for common|renderer, but believe we can do that later
> when necessary.
> 
> BUG=239109
> TBR=mnaganov,thestig,avi
> NOTRY=true
> 
> Review URL: https://chromiumcodereview.appspot.com/15716007

TBR=kinuko@chromium.org

Review URL: https://codereview.chromium.org/16365013

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

45 files changed, 547 insertions, 440 deletions

diff --git a/android_webview/native/webview_native.gyp b/android_webview/native/webview_native.gyp
index 0cff540..0ef141d 100644
--- a/android_webview/native/webview_native.gyp
+++ b/android_webview/native/webview_native.gyp
@@ -20,8 +20,7 @@
         '../../skia/skia.gyp:skia',
         '../../ui/ui.gyp:ui',
         '../../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
-        '../../webkit/storage_browser.gyp:webkit_storage_browser',
-        '../../webkit/storage_common.gyp:webkit_storage_common',
+        '../../webkit/support/webkit_support.gyp:webkit_storage',
         'android_webview_native_jni',
       ],
       'include_dirs': [
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 36c6eb9..6021ac4 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2380,10 +2380,9 @@
             '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
             '../v8/tools/gyp/v8.gyp:v8',
             '../webkit/plugins/webkit_plugins.gyp:plugins_common',
-            '../webkit/storage_browser.gyp:webkit_storage_browser',
-            '../webkit/storage_common.gyp:webkit_storage_common',
             '../webkit/support/webkit_support.gyp:glue_common',
             '../webkit/support/webkit_support.gyp:webkit_resources',
+            '../webkit/support/webkit_support.gyp:webkit_storage',
           ],
           'defines': [
             '<@(nacl_defines)',
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index e7ae8ef..5392779 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -90,8 +90,7 @@
         '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
         '../webkit/support/webkit_support.gyp:glue',
         '../webkit/support/webkit_support.gyp:webkit_resources',
-        '../webkit/storage_browser.gyp:webkit_storage_browser',
-        '../webkit/storage_common.gyp:webkit_storage_common',
+        '../webkit/support/webkit_support.gyp:webkit_storage',
         'chrome_resources.gyp:chrome_strings',
       ],
       'defines': [
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index 100d5bc..c7e2a00 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -41,12 +41,11 @@
         '../ui/ui.gyp:ui',
         '../ui/ui.gyp:ui_resources',
         '../url/url.gyp:url_lib',
-        '../webkit/base/webkit_base.gyp:webkit_base',
         '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
-        '../webkit/storage_browser.gyp:webkit_storage_browser',
-        '../webkit/storage_common.gyp:webkit_storage_common',
         '../webkit/support/webkit_support.gyp:glue',
+        '../webkit/support/webkit_support.gyp:webkit_base',
         '../webkit/support/webkit_support.gyp:webkit_resources',
+        '../webkit/support/webkit_support.gyp:webkit_storage',
       ],
       'include_dirs': [
         '..',
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index c649f31..9e4cebd 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -2380,9 +2380,8 @@
             '../v8/tools/gyp/v8.gyp:v8',
             '../webkit/support/webkit_support.gyp:glue',
             '../webkit/support/webkit_support.gyp:webkit_common',
+            '../webkit/support/webkit_support.gyp:webkit_storage',
             '../webkit/support/webkit_support.gyp:webkit_resources',
-            '../webkit/storage_browser.gyp:webkit_storage_browser',
-            '../webkit/storage_common.gyp:webkit_storage_common',
           ],
           'defines': [
             '<@(nacl_defines)',
diff --git a/content/child/fileapi/webfilesystem_callback_adapters.cc b/content/child/fileapi/webfilesystem_callback_adapters.cc
index b061a22..24538ef 100644
--- a/content/child/fileapi/webfilesystem_callback_adapters.cc
+++ b/content/child/fileapi/webfilesystem_callback_adapters.cc
@@ -12,7 +12,6 @@
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h"
 #include "third_party/WebKit/public/platform/WebFileInfo.h"
-#include "third_party/WebKit/public/platform/WebFileSystem.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "webkit/base/file_path_string_conversions.h"
 #include "webkit/common/fileapi/directory_entry.h"
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index f2732e3..0ebc992 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -1156,9 +1156,8 @@
         '../ui/surface/surface.gyp:surface',
         '../webkit/support/webkit_support.gyp:webkit_common',
         '../webkit/support/webkit_support.gyp:webkit_resources',
+        '../webkit/support/webkit_support.gyp:webkit_storage',
         '../webkit/support/webkit_support.gyp:webkit_strings',
-        '../webkit/storage_browser.gyp:webkit_storage_browser',
-        '../webkit/storage_common.gyp:webkit_storage_common',
       ],
     }],
     ['OS!="mac" and OS!="ios"', {
diff --git a/content/content_child.gypi b/content/content_child.gypi
index f29d27d..784371b 100644
--- a/content/content_child.gypi
+++ b/content/content_child.gypi
@@ -88,8 +88,8 @@
       'dependencies': [
         '../third_party/WebKit/public/blink.gyp:blink',
         '../third_party/npapi/npapi.gyp:npapi',
-        '../webkit/base/webkit_base.gyp:webkit_base',
         '../webkit/support/webkit_support.gyp:glue',
+        '../webkit/support/webkit_support.gyp:webkit_base',
       ],
     }],
   ],
diff --git a/content/content_common.gypi b/content/content_common.gypi
index f463700..af7ef55 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -372,10 +372,9 @@
         '../media/media.gyp:shared_memory_support',
         '../third_party/WebKit/public/blink.gyp:blink',
         '../ui/gl/gl.gyp:gl',
-        '../webkit/base/webkit_base.gyp:webkit_base',
-        '../webkit/storage_browser.gyp:webkit_storage_browser',
-        '../webkit/storage_common.gyp:webkit_storage_common',
         '../webkit/support/webkit_support.gyp:glue',
+        '../webkit/support/webkit_support.gyp:webkit_base',
+        '../webkit/support/webkit_support.gyp:webkit_storage',
       ],
     }],
     ['OS=="android"',{
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 1f1a0d7..9008ba8 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -20,8 +20,6 @@
     '../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_bindings',
     '../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
     '../webkit/plugins/webkit_plugins.gyp:plugins_common',
-    '../webkit/storage_renderer.gyp:webkit_storage_renderer',
-    '../webkit/storage_common.gyp:webkit_storage_common',
     '../webkit/support/webkit_support.gyp:glue',
     '../webkit/support/webkit_support.gyp:glue_common',
     '../webkit/support/webkit_support.gyp:glue_renderer',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 33e0713..39e14bc 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -171,10 +171,8 @@
             '../ui/surface/surface.gyp:surface',
             '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
             '../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
+            '../webkit/support/webkit_support.gyp:webkit_storage',
             '../webkit/support/webkit_support.gyp:webkit_support_common',
-            '../webkit/storage_browser.gyp:webkit_storage_browser',
-            '../webkit/storage_common.gyp:webkit_storage_common',
-            '../webkit/storage_renderer.gyp:webkit_storage_renderer',
           ],
         }],
         ['OS == "win" or toolkit_uses_gtk == 1', {
@@ -566,18 +564,16 @@
             '../third_party/libjingle/libjingle.gyp:libjingle',
             '../ui/gl/gl.gyp:gl',
             '../v8/tools/gyp/v8.gyp:v8',
-            '../webkit/base/webkit_base.gyp:webkit_base',
             '../webkit/plugins/webkit_plugins.gyp:plugins_common',
             '../webkit/plugins/webkit_plugins.gyp:test_mock_plugin_list',
-            '../webkit/storage_browser.gyp:webkit_storage_browser',
-            '../webkit/storage_common.gyp:webkit_storage_common',
-            '../webkit/storage_renderer.gyp:webkit_storage_renderer',
             '../webkit/support/webkit_support.gyp:glue',
             '../webkit/support/webkit_support.gyp:glue_common',
             '../webkit/support/webkit_support.gyp:glue_renderer',
             '../webkit/support/webkit_support.gyp:plugins',
+            '../webkit/support/webkit_support.gyp:webkit_base',
             '../webkit/support/webkit_support.gyp:webkit_common',
             '../webkit/support/webkit_support.gyp:webkit_media',
+            '../webkit/support/webkit_support.gyp:webkit_storage',
           ],
         }],
         ['enable_plugins==0', {
diff --git a/webkit/base/webkit_base.gyp b/webkit/base/webkit_base.gypi
index 467bb13..1dd2769 100644
--- a/webkit/base/webkit_base.gyp
+++ b/webkit/base/webkit_base.gypi
@@ -1,4 +1,4 @@
-# Copyright 2013 The Chromium Authors. All rights reserved.
+# Copyright (c) 2012 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.
 
diff --git a/webkit/browser/appcache/appcache_response.h b/webkit/browser/appcache/appcache_response.h
index 63bb7da..3d992db 100644
--- a/webkit/browser/appcache/appcache_response.h
+++ b/webkit/browser/appcache/appcache_response.h
@@ -13,7 +13,6 @@
 #include "net/base/completion_callback.h"
 #include "net/http/http_response_info.h"
 #include "webkit/common/appcache/appcache_interfaces.h"
-#include "webkit/storage/webkit_storage_export.h"
 
 namespace net {
 class IOBuffer;
@@ -257,3 +256,4 @@ class WEBKIT_STORAGE_EXPORT AppCacheResponseWriter : public AppCacheResponseIO {
 }  // namespace appcache
 
 #endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_RESPONSE_H_
+
diff --git a/webkit/browser/appcache/webkit_browser_appcache.gypi b/webkit/browser/appcache/webkit_browser_appcache.gypi
new file mode 100644
index 0000000..33ec9b5
--- /dev/null
+++ b/webkit/browser/appcache/webkit_browser_appcache.gypi
@@ -0,0 +1,50 @@
+# Copyright 2013 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.
+
+{
+  'variables': {
+    'webkit_browser_appcache_sources': [
+      '../browser/appcache/appcache.cc',
+      '../browser/appcache/appcache.h',
+      '../browser/appcache/appcache_backend_impl.cc',
+      '../browser/appcache/appcache_backend_impl.h',
+      '../browser/appcache/appcache_database.cc',
+      '../browser/appcache/appcache_database.h',
+      '../browser/appcache/appcache_disk_cache.cc',
+      '../browser/appcache/appcache_disk_cache.h',
+      '../browser/appcache/appcache_entry.h',
+      '../browser/appcache/appcache_group.cc',
+      '../browser/appcache/appcache_group.h',
+      '../browser/appcache/appcache_histograms.cc',
+      '../browser/appcache/appcache_histograms.h',
+      '../browser/appcache/appcache_host.cc',
+      '../browser/appcache/appcache_host.h',
+      '../browser/appcache/appcache_interceptor.cc',
+      '../browser/appcache/appcache_interceptor.h',
+      '../browser/appcache/appcache_policy.h',
+      '../browser/appcache/appcache_quota_client.cc',
+      '../browser/appcache/appcache_quota_client.h',
+      '../browser/appcache/appcache_request_handler.cc',
+      '../browser/appcache/appcache_request_handler.h',
+      '../browser/appcache/appcache_response.cc',
+      '../browser/appcache/appcache_response.h',
+      '../browser/appcache/appcache_service.cc',
+      '../browser/appcache/appcache_service.h',
+      '../browser/appcache/appcache_storage.cc',
+      '../browser/appcache/appcache_storage.h',
+      '../browser/appcache/appcache_storage_impl.cc',
+      '../browser/appcache/appcache_storage_impl.h',
+      '../browser/appcache/appcache_working_set.cc',
+      '../browser/appcache/appcache_working_set.h',
+      '../browser/appcache/appcache_update_job.cc',
+      '../browser/appcache/appcache_update_job.h',
+      '../browser/appcache/appcache_url_request_job.cc',
+      '../browser/appcache/appcache_url_request_job.h',
+      '../browser/appcache/manifest_parser.cc',
+      '../browser/appcache/manifest_parser.h',
+      '../browser/appcache/view_appcache_internals_job.h',
+      '../browser/appcache/view_appcache_internals_job.cc',
+    ],
+  },
+}
diff --git a/webkit/browser/blob/webkit_browser_blob.gypi b/webkit/browser/blob/webkit_browser_blob.gypi
new file mode 100644
index 0000000..fd4d6ee
--- /dev/null
+++ b/webkit/browser/blob/webkit_browser_blob.gypi
@@ -0,0 +1,26 @@
+# Copyright (c) 2012 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.
+
+{
+  'variables': {
+    'webkit_browser_blob_sources': [
+      '../browser/blob/blob_data_handle.cc',
+      '../browser/blob/blob_data_handle.h',
+      '../browser/blob/blob_storage_controller.cc',
+      '../browser/blob/blob_storage_controller.h',
+      '../browser/blob/blob_storage_context.cc',
+      '../browser/blob/blob_storage_context.h',
+      '../browser/blob/blob_storage_host.cc',
+      '../browser/blob/blob_storage_host.h',
+      '../browser/blob/blob_url_request_job.cc',
+      '../browser/blob/blob_url_request_job.h',
+      '../browser/blob/blob_url_request_job_factory.cc',
+      '../browser/blob/blob_url_request_job_factory.h',
+      '../browser/blob/local_file_stream_reader.cc',
+      '../browser/blob/local_file_stream_reader.h',
+      '../browser/blob/view_blob_internals_job.cc',
+      '../browser/blob/view_blob_internals_job.h',
+    ],
+  },
+}
diff --git a/webkit/browser/database/webkit_browser_database.gypi b/webkit/browser/database/webkit_browser_database.gypi
new file mode 100644
index 0000000..0e4e9ad
--- /dev/null
+++ b/webkit/browser/database/webkit_browser_database.gypi
@@ -0,0 +1,20 @@
+# Copyright 2013 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.
+
+{
+  'variables': {
+    'webkit_browser_database_sources': [
+      '../browser/database/databases_table.cc',
+      '../browser/database/databases_table.h',
+      '../browser/database/database_quota_client.cc',
+      '../browser/database/database_quota_client.h',
+      '../browser/database/database_tracker.cc',
+      '../browser/database/database_tracker.h',
+      '../browser/database/database_util.cc',
+      '../browser/database/database_util.h',
+      '../browser/database/vfs_backend.cc',
+      '../browser/database/vfs_backend.h',
+    ],
+  },
+}
diff --git a/webkit/browser/dom_storage/webkit_browser_dom_storage.gypi b/webkit/browser/dom_storage/webkit_browser_dom_storage.gypi
new file mode 100644
index 0000000..ed77205
--- /dev/null
+++ b/webkit/browser/dom_storage/webkit_browser_dom_storage.gypi
@@ -0,0 +1,31 @@
+# Copyright (c) 2013 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.
+
+{
+  'variables': {
+    'webkit_browser_dom_storage_sources': [
+      '../browser/dom_storage/dom_storage_area.cc',
+      '../browser/dom_storage/dom_storage_area.h',
+      '../browser/dom_storage/dom_storage_context.cc',
+      '../browser/dom_storage/dom_storage_context.h',
+      '../browser/dom_storage/dom_storage_database.cc',
+      '../browser/dom_storage/dom_storage_database.h',
+      '../browser/dom_storage/dom_storage_database_adapter.h',
+      '../browser/dom_storage/dom_storage_host.cc',
+      '../browser/dom_storage/dom_storage_host.h',
+      '../browser/dom_storage/dom_storage_namespace.cc',
+      '../browser/dom_storage/dom_storage_namespace.h',
+      '../browser/dom_storage/dom_storage_session.cc',
+      '../browser/dom_storage/dom_storage_session.h',
+      '../browser/dom_storage/dom_storage_task_runner.cc',
+      '../browser/dom_storage/dom_storage_task_runner.h',
+      '../browser/dom_storage/local_storage_database_adapter.cc',
+      '../browser/dom_storage/local_storage_database_adapter.h',
+      '../browser/dom_storage/session_storage_database.cc',
+      '../browser/dom_storage/session_storage_database.h',
+      '../browser/dom_storage/session_storage_database_adapter.cc',
+      '../browser/dom_storage/session_storage_database_adapter.h',
+    ],
+  },
+}
diff --git a/webkit/browser/fileapi/file_system_mount_point_provider.h b/webkit/browser/fileapi/file_system_mount_point_provider.h
index 83511c2..3d1a552 100644
--- a/webkit/browser/fileapi/file_system_mount_point_provider.h
+++ b/webkit/browser/fileapi/file_system_mount_point_provider.h
@@ -17,8 +17,6 @@
 #include "webkit/common/fileapi/file_system_types.h"
 #include "webkit/storage/webkit_storage_export.h"
 
-class GURL;
-
 namespace webkit_blob {
 class FileStreamReader;
 }
diff --git a/webkit/browser/fileapi/webkit_browser_fileapi.gypi b/webkit/browser/fileapi/webkit_browser_fileapi.gypi
new file mode 100644
index 0000000..8e30e06
--- /dev/null
+++ b/webkit/browser/fileapi/webkit_browser_fileapi.gypi
@@ -0,0 +1,147 @@
+# Copyright 2013 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.
+
+{
+  'variables': {
+    'webkit_browser_fileapi_sources': [
+      '../browser/fileapi/async_file_util.h',
+      '../browser/fileapi/async_file_util_adapter.cc',
+      '../browser/fileapi/async_file_util_adapter.h',
+      '../browser/fileapi/copy_or_move_file_validator.h',
+      '../browser/fileapi/copy_or_move_operation_delegate.cc',
+      '../browser/fileapi/copy_or_move_operation_delegate.h',
+      '../browser/fileapi/external_mount_points.cc',
+      '../browser/fileapi/external_mount_points.h',
+      '../browser/fileapi/file_observers.h',
+      '../browser/fileapi/file_permission_policy.cc',
+      '../browser/fileapi/file_permission_policy.h',
+      '../browser/fileapi/file_stream_writer.h',
+      '../browser/fileapi/file_system_context.cc',
+      '../browser/fileapi/file_system_context.h',
+      '../browser/fileapi/file_system_dir_url_request_job.cc',
+      '../browser/fileapi/file_system_dir_url_request_job.h',
+      '../browser/fileapi/file_system_file_stream_reader.cc',
+      '../browser/fileapi/file_system_file_stream_reader.h',
+      '../browser/fileapi/file_system_file_util.cc',
+      '../browser/fileapi/file_system_file_util.h',
+      '../browser/fileapi/file_system_mount_point_provider.h',
+      '../browser/fileapi/file_system_operation.h',
+      '../browser/fileapi/file_system_operation_runner.cc',
+      '../browser/fileapi/file_system_operation_runner.h',
+      '../browser/fileapi/file_system_operation_context.cc',
+      '../browser/fileapi/file_system_operation_context.h',
+      '../browser/fileapi/file_system_options.cc',
+      '../browser/fileapi/file_system_options.h',
+      '../browser/fileapi/file_system_quota_client.cc',
+      '../browser/fileapi/file_system_quota_client.h',
+      '../browser/fileapi/file_system_quota_util.h',
+      '../browser/fileapi/file_system_task_runners.cc',
+      '../browser/fileapi/file_system_task_runners.h',
+      '../browser/fileapi/file_system_url.cc',
+      '../browser/fileapi/file_system_url.h',
+      '../browser/fileapi/file_system_url_request_job.cc',
+      '../browser/fileapi/file_system_url_request_job.h',
+      '../browser/fileapi/file_system_url_request_job_factory.cc',
+      '../browser/fileapi/file_system_url_request_job_factory.h',
+      '../browser/fileapi/file_system_usage_cache.cc',
+      '../browser/fileapi/file_system_usage_cache.h',
+      '../browser/fileapi/file_writer_delegate.cc',
+      '../browser/fileapi/file_writer_delegate.h',
+      '../browser/fileapi/isolated_context.cc',
+      '../browser/fileapi/isolated_context.h',
+      '../browser/fileapi/isolated_file_util.cc',
+      '../browser/fileapi/isolated_file_util.h',
+      '../browser/fileapi/isolated_mount_point_provider.cc',
+      '../browser/fileapi/isolated_mount_point_provider.h',
+      '../browser/fileapi/local_file_stream_writer.cc',
+      '../browser/fileapi/local_file_stream_writer.h',
+      '../browser/fileapi/local_file_system_operation.cc',
+      '../browser/fileapi/local_file_system_operation.h',
+      '../browser/fileapi/local_file_util.cc',
+      '../browser/fileapi/local_file_util.h',
+      '../browser/fileapi/mount_points.cc',
+      '../browser/fileapi/mount_points.h',
+      '../browser/fileapi/native_file_util.cc',
+      '../browser/fileapi/native_file_util.h',
+      '../browser/fileapi/obfuscated_file_util.cc',
+      '../browser/fileapi/obfuscated_file_util.h',
+      '../browser/fileapi/open_file_system_mode.h',
+      '../browser/fileapi/recursive_operation_delegate.cc',
+      '../browser/fileapi/recursive_operation_delegate.h',
+      '../browser/fileapi/remote_file_system_proxy.h',
+      '../browser/fileapi/remove_operation_delegate.cc',
+      '../browser/fileapi/remove_operation_delegate.h',
+      '../browser/fileapi/sandbox_directory_database.cc',
+      '../browser/fileapi/sandbox_directory_database.h',
+      '../browser/fileapi/sandbox_file_stream_writer.cc',
+      '../browser/fileapi/sandbox_file_stream_writer.h',
+      '../browser/fileapi/sandbox_isolated_origin_database.cc',
+      '../browser/fileapi/sandbox_isolated_origin_database.h',
+      '../browser/fileapi/sandbox_mount_point_provider.cc',
+      '../browser/fileapi/sandbox_mount_point_provider.h',
+      '../browser/fileapi/sandbox_origin_database.cc',
+      '../browser/fileapi/sandbox_origin_database.h',
+      '../browser/fileapi/sandbox_origin_database_interface.cc',
+      '../browser/fileapi/sandbox_origin_database_interface.h',
+      '../browser/fileapi/sandbox_quota_observer.cc',
+      '../browser/fileapi/sandbox_quota_observer.h',
+      '../browser/fileapi/syncable/file_change.cc',
+      '../browser/fileapi/syncable/file_change.h',
+      '../browser/fileapi/syncable/local_file_change_tracker.cc',
+      '../browser/fileapi/syncable/local_file_change_tracker.h',
+      '../browser/fileapi/syncable/local_file_sync_context.cc',
+      '../browser/fileapi/syncable/local_file_sync_context.h',
+      '../browser/fileapi/syncable/local_file_sync_status.cc',
+      '../browser/fileapi/syncable/local_file_sync_status.h',
+      '../browser/fileapi/syncable/local_origin_change_observer.h',
+      '../browser/fileapi/syncable/sync_action.h',
+      '../browser/fileapi/syncable/sync_callbacks.h',
+      '../browser/fileapi/syncable/sync_direction.h',
+      '../browser/fileapi/syncable/sync_file_metadata.cc',
+      '../browser/fileapi/syncable/sync_file_metadata.h',
+      '../browser/fileapi/syncable/sync_file_status.h',
+      '../browser/fileapi/syncable/sync_file_type.h',
+      '../browser/fileapi/syncable/sync_status_code.cc',
+      '../browser/fileapi/syncable/sync_status_code.h',
+      '../browser/fileapi/syncable/syncable_file_operation_runner.cc',
+      '../browser/fileapi/syncable/syncable_file_operation_runner.h',
+      '../browser/fileapi/syncable/syncable_file_system_operation.cc',
+      '../browser/fileapi/syncable/syncable_file_system_operation.h',
+      '../browser/fileapi/syncable/syncable_file_system_util.cc',
+      '../browser/fileapi/syncable/syncable_file_system_util.h',
+      '../browser/fileapi/task_runner_bound_observer_list.h',
+      '../browser/fileapi/test_mount_point_provider.cc',
+      '../browser/fileapi/test_mount_point_provider.h',
+      '../browser/fileapi/transient_file_util.cc',
+      '../browser/fileapi/transient_file_util.h',
+      '../browser/fileapi/upload_file_system_file_element_reader.cc',
+      '../browser/fileapi/upload_file_system_file_element_reader.h',
+    ],
+    'webkit_browser_fileapi_chromeos_sources': [
+      '../browser/chromeos/fileapi/async_file_stream.h',
+      '../browser/chromeos/fileapi/cros_mount_point_provider.cc',
+      '../browser/chromeos/fileapi/cros_mount_point_provider.h',
+      '../browser/chromeos/fileapi/file_access_permissions.cc',
+      '../browser/chromeos/fileapi/file_access_permissions.h',
+      '../browser/chromeos/fileapi/file_util_async.h',
+      '../browser/chromeos/fileapi/remote_file_system_operation.cc',
+      '../browser/chromeos/fileapi/remote_file_system_operation.h',
+      '../browser/chromeos/fileapi/remote_file_stream_writer.cc',
+      '../browser/chromeos/fileapi/remote_file_stream_writer.h',
+    ],
+  },
+  'targets': [
+    {
+      'target_name': 'dump_file_system',
+      'type': 'executable',
+      'sources': [
+        'dump_file_system.cc',
+      ],
+      'dependencies': [
+        '<(DEPTH)/base/base.gyp:base',
+        '../support/webkit_support.gyp:webkit_storage',
+      ],
+    },
+  ],
+}
diff --git a/webkit/browser/quota/webkit_browser_quota.gypi b/webkit/browser/quota/webkit_browser_quota.gypi
new file mode 100644
index 0000000..a277afd
--- /dev/null
+++ b/webkit/browser/quota/webkit_browser_quota.gypi
@@ -0,0 +1,24 @@
+# Copyright 2013 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.
+
+{
+  'variables': {
+    'webkit_browser_quota_sources': [
+      '../browser/quota/quota_callbacks.h',
+      '../browser/quota/quota_client.h',
+      '../browser/quota/quota_database.cc',
+      '../browser/quota/quota_database.h',
+      '../browser/quota/quota_manager.cc',
+      '../browser/quota/quota_manager.h',
+      '../browser/quota/quota_task.cc',
+      '../browser/quota/quota_task.h',
+      '../browser/quota/quota_temporary_storage_evictor.cc',
+      '../browser/quota/quota_temporary_storage_evictor.h',
+      '../browser/quota/special_storage_policy.cc',
+      '../browser/quota/special_storage_policy.h',
+      '../browser/quota/usage_tracker.cc',
+      '../browser/quota/usage_tracker.h',
+    ],
+  },
+}
diff --git a/webkit/browser/webkit_browser.gypi b/webkit/browser/webkit_browser.gypi
new file mode 100644
index 0000000..f779bc7
--- /dev/null
+++ b/webkit/browser/webkit_browser.gypi
@@ -0,0 +1,26 @@
+# Copyright 2013 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.
+
+{
+  'includes': [
+    '../browser/appcache/webkit_browser_appcache.gypi',
+    '../browser/blob/webkit_browser_blob.gypi',
+    '../browser/database/webkit_browser_database.gypi',
+    '../browser/dom_storage/webkit_browser_dom_storage.gypi',
+    '../browser/fileapi/webkit_browser_fileapi.gypi',
+    '../browser/quota/webkit_browser_quota.gypi',
+  ],
+  # TODO(kinuko): Have webkit_browser target and deprecate old gypis like
+  # webkit_storage.gypi.
+  'variables': {
+    'webkit_browser_storage_sources': [
+      '<@(webkit_browser_appcache_sources)',
+      '<@(webkit_browser_blob_sources)',
+      '<@(webkit_browser_database_sources)',
+      '<@(webkit_browser_dom_storage_sources)',
+      '<@(webkit_browser_fileapi_sources)',
+      '<@(webkit_browser_quota_sources)',
+    ],
+  },
+}
diff --git a/webkit/common/appcache/appcache_interfaces.h b/webkit/common/appcache/appcache_interfaces.h
index 8ab53f0..38b6955 100644
--- a/webkit/common/appcache/appcache_interfaces.h
+++ b/webkit/common/appcache/appcache_interfaces.h
@@ -11,7 +11,7 @@
 #include "base/files/file_path.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
-#include "webkit/common/webkit_common_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace net {
 class URLRequest;
@@ -61,7 +61,7 @@ enum NamespaceType {
   NETWORK_NAMESPACE
 };
 
-struct WEBKIT_COMMON_EXPORT AppCacheInfo {
+struct WEBKIT_STORAGE_EXPORT AppCacheInfo {
   AppCacheInfo();
   ~AppCacheInfo();
 
@@ -79,7 +79,7 @@ struct WEBKIT_COMMON_EXPORT AppCacheInfo {
 typedef std::vector<AppCacheInfo> AppCacheInfoVector;
 
 // Type to hold information about a single appcache resource.
-struct WEBKIT_COMMON_EXPORT AppCacheResourceInfo {
+struct WEBKIT_STORAGE_EXPORT AppCacheResourceInfo {
   AppCacheResourceInfo();
   ~AppCacheResourceInfo();
 
@@ -96,7 +96,7 @@ struct WEBKIT_COMMON_EXPORT AppCacheResourceInfo {
 
 typedef std::vector<AppCacheResourceInfo> AppCacheResourceInfoVector;
 
-struct WEBKIT_COMMON_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,
             bool is_pattern);
@@ -116,7 +116,7 @@ struct WEBKIT_COMMON_EXPORT Namespace {
 typedef std::vector<Namespace> NamespaceVector;
 
 // Interface used by backend (browser-process) to talk to frontend (renderer).
-class WEBKIT_COMMON_EXPORT AppCacheFrontend {
+class WEBKIT_STORAGE_EXPORT AppCacheFrontend {
  public:
   virtual void OnCacheSelected(
       int host_id, const appcache::AppCacheInfo& info) = 0;
@@ -137,7 +137,7 @@ class WEBKIT_COMMON_EXPORT AppCacheFrontend {
 };
 
 // Interface used by frontend (renderer) to talk to backend (browser-process).
-class WEBKIT_COMMON_EXPORT AppCacheBackend {
+class WEBKIT_STORAGE_EXPORT AppCacheBackend {
  public:
   virtual void RegisterHost(int host_id) = 0;
   virtual void UnregisterHost(int host_id) = 0;
@@ -169,22 +169,21 @@ class WEBKIT_COMMON_EXPORT AppCacheBackend {
 // Note: These are also defined elsewhere in the chrome code base in
 // url_contants.h .cc, however the appcache library doesn't not have
 // any dependencies on the chrome library, so we can't use them in here.
-WEBKIT_COMMON_EXPORT extern const char kHttpScheme[];
-WEBKIT_COMMON_EXPORT extern const char kHttpsScheme[];
-WEBKIT_COMMON_EXPORT extern const char kHttpGETMethod[];
-WEBKIT_COMMON_EXPORT extern const char kHttpHEADMethod[];
+extern const char kHttpScheme[];
+extern const char kHttpsScheme[];
+extern const char kHttpGETMethod[];
+extern const char kHttpHEADMethod[];
 
 // CommandLine flag to turn this experimental feature on.
-WEBKIT_COMMON_EXPORT extern const char kEnableExecutableHandlers[];
+extern const char kEnableExecutableHandlers[];
 
-WEBKIT_COMMON_EXPORT void AddSupportedScheme(const char* scheme);
+WEBKIT_STORAGE_EXPORT void AddSupportedScheme(const char* scheme);
 
-WEBKIT_COMMON_EXPORT bool IsSchemeSupported(const GURL& url);
-WEBKIT_COMMON_EXPORT bool IsMethodSupported(const std::string& method);
-WEBKIT_COMMON_EXPORT bool IsSchemeAndMethodSupported(
-    const net::URLRequest* request);
+bool IsSchemeSupported(const GURL& url);
+bool IsMethodSupported(const std::string& method);
+bool IsSchemeAndMethodSupported(const net::URLRequest* request);
 
-WEBKIT_COMMON_EXPORT extern const base::FilePath::CharType
+WEBKIT_STORAGE_EXPORT extern const base::FilePath::CharType
     kAppCacheDatabaseName[];
 
 }  // namespace
diff --git a/webkit/common/blob/blob_data.h b/webkit/common/blob/blob_data.h
index c8fd260..a25539b 100644
--- a/webkit/common/blob/blob_data.h
+++ b/webkit/common/blob/blob_data.h
@@ -15,11 +15,11 @@
 #include "googleurl/src/gurl.h"
 #include "webkit/base/data_element.h"
 #include "webkit/common/blob/shareable_file_reference.h"
-#include "webkit/common/webkit_common_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace webkit_blob {
 
-class WEBKIT_COMMON_EXPORT BlobData : public base::RefCounted<BlobData> {
+class WEBKIT_STORAGE_EXPORT BlobData : public base::RefCounted<BlobData> {
  public:
   typedef webkit_base::DataElement Item;
 
diff --git a/webkit/common/blob/scoped_file.h b/webkit/common/blob/scoped_file.h
index 7bbbc0d..38766fc 100644
--- a/webkit/common/blob/scoped_file.h
+++ b/webkit/common/blob/scoped_file.h
@@ -11,7 +11,7 @@
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/move.h"
-#include "webkit/common/webkit_common_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace base {
 class TaskRunner;
@@ -26,7 +26,7 @@ namespace webkit_blob {
 //
 // TODO(kinuko): Probably this can be moved under base or somewhere more
 // common place.
-class WEBKIT_COMMON_EXPORT ScopedFile {
+class WEBKIT_STORAGE_EXPORT ScopedFile {
   // To support destructive assignment from an l-value assignment.
   // This provides Pass() method which creates an r-value for the current
   // instance. (See base/move.h for details)
diff --git a/webkit/common/blob/shareable_file_reference.h b/webkit/common/blob/shareable_file_reference.h
index 987374b..53736a4 100644
--- a/webkit/common/blob/shareable_file_reference.h
+++ b/webkit/common/blob/shareable_file_reference.h
@@ -15,7 +15,7 @@ namespace webkit_blob {
 // same path if it already exists in its internal map.
 // This class is non-thread-safe and all methods must be called on a single
 // thread.
-class WEBKIT_COMMON_EXPORT ShareableFileReference
+class WEBKIT_STORAGE_EXPORT ShareableFileReference
     : public base::RefCounted<ShareableFileReference> {
  public:
   typedef ScopedFile::ScopeOutCallback FinalReleaseCallback;
diff --git a/webkit/common/blob/webkit_common_blob.gypi b/webkit/common/blob/webkit_common_blob.gypi
new file mode 100644
index 0000000..246041f
--- /dev/null
+++ b/webkit/common/blob/webkit_common_blob.gypi
@@ -0,0 +1,16 @@
+# Copyright (c) 2013 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.
+
+{
+  'variables': {
+    'webkit_common_blob_sources': [
+      '../common/blob/blob_data.cc',
+      '../common/blob/blob_data.h',
+      '../common/blob/scoped_file.cc',
+      '../common/blob/scoped_file.h',
+      '../common/blob/shareable_file_reference.cc',
+      '../common/blob/shareable_file_reference.h',
+    ],
+  },
+}
diff --git a/webkit/common/database/database_connections.h b/webkit/common/database/database_connections.h
index 4c3cbba..e81c053 100644
--- a/webkit/common/database/database_connections.h
+++ b/webkit/common/database/database_connections.h
@@ -11,7 +11,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
 #include "base/synchronization/lock.h"
-#include "webkit/common/webkit_common_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace base {
 class MessageLoopProxy;
@@ -19,7 +19,7 @@ class MessageLoopProxy;
 
 namespace webkit_database {
 
-class WEBKIT_COMMON_EXPORT DatabaseConnections {
+class WEBKIT_STORAGE_EXPORT DatabaseConnections {
  public:
   DatabaseConnections();
   ~DatabaseConnections();
@@ -68,7 +68,7 @@ class WEBKIT_COMMON_EXPORT DatabaseConnections {
 // A wrapper class that provides thread-safety and the
 // ability to wait until all connections have closed.
 // Intended for use in renderer processes.
-class WEBKIT_COMMON_EXPORT DatabaseConnectionsWrapper
+class WEBKIT_STORAGE_EXPORT DatabaseConnectionsWrapper
     : public base::RefCountedThreadSafe<DatabaseConnectionsWrapper> {
  public:
   DatabaseConnectionsWrapper();
diff --git a/webkit/common/database/webkit_common_database.gypi b/webkit/common/database/webkit_common_database.gypi
new file mode 100644
index 0000000..d1851ed
--- /dev/null
+++ b/webkit/common/database/webkit_common_database.gypi
@@ -0,0 +1,12 @@
+# Copyright 2013 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.
+
+{
+  'variables': {
+    'webkit_common_database_sources': [
+      '../common/database/database_connections.cc',
+      '../common/database/database_connections.h',
+    ],
+  },
+}
diff --git a/webkit/common/dom_storage/dom_storage_map.h b/webkit/common/dom_storage/dom_storage_map.h
index 76650b4..f57e387 100644
--- a/webkit/common/dom_storage/dom_storage_map.h
+++ b/webkit/common/dom_storage/dom_storage_map.h
@@ -11,14 +11,14 @@
 #include "base/nullable_string16.h"
 #include "base/string16.h"
 #include "webkit/common/dom_storage/dom_storage_types.h"
-#include "webkit/common/webkit_common_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace dom_storage {
 
 // A wrapper around a std::map that adds refcounting and
 // tracks the size in bytes of the keys/values, enforcing a quota.
 // See class comments for DomStorageContext for a larger overview.
-class WEBKIT_COMMON_EXPORT DomStorageMap
+class WEBKIT_STORAGE_EXPORT DomStorageMap
     : public base::RefCountedThreadSafe<DomStorageMap> {
  public:
   explicit DomStorageMap(size_t quota);
diff --git a/webkit/common/dom_storage/dom_storage_types.h b/webkit/common/dom_storage/dom_storage_types.h
index a2a2411..fd5b800 100644
--- a/webkit/common/dom_storage/dom_storage_types.h
+++ b/webkit/common/dom_storage/dom_storage_types.h
@@ -12,7 +12,7 @@
 #include "base/string16.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
-#include "webkit/common/webkit_common_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace dom_storage {
 
@@ -40,7 +40,7 @@ const int kInvalidAreaId = -1;
 
 typedef std::map<base::string16, NullableString16> ValuesMap;
 
-struct WEBKIT_COMMON_EXPORT LocalStorageUsageInfo {
+struct WEBKIT_STORAGE_EXPORT LocalStorageUsageInfo {
   GURL origin;
   size_t data_size;
   base::Time last_modified;
@@ -49,7 +49,7 @@ struct WEBKIT_COMMON_EXPORT LocalStorageUsageInfo {
   ~LocalStorageUsageInfo();
 };
 
-struct WEBKIT_COMMON_EXPORT SessionStorageUsageInfo {
+struct WEBKIT_STORAGE_EXPORT SessionStorageUsageInfo {
   GURL origin;
   std::string persistent_namespace_id;
 
diff --git a/webkit/common/dom_storage/webkit_common_dom_storage.gypi b/webkit/common/dom_storage/webkit_common_dom_storage.gypi
new file mode 100644
index 0000000..dd9d018
--- /dev/null
+++ b/webkit/common/dom_storage/webkit_common_dom_storage.gypi
@@ -0,0 +1,14 @@
+# Copyright (c) 2013 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.
+
+{
+  'variables': {
+    'webkit_common_dom_storage_sources': [
+      '../common/dom_storage/dom_storage_map.cc',
+      '../common/dom_storage/dom_storage_map.h',
+      '../common/dom_storage/dom_storage_types.cc',
+      '../common/dom_storage/dom_storage_types.h',
+    ],
+  },
+}
diff --git a/webkit/common/fileapi/file_system_types.h b/webkit/common/fileapi/file_system_types.h
index 8ed1b84..22d1d07 100644
--- a/webkit/common/fileapi/file_system_types.h
+++ b/webkit/common/fileapi/file_system_types.h
@@ -5,6 +5,7 @@
 #ifndef WEBKIT_COMMON_FILEAPI_FILE_SYSTEM_TYPES_H_
 #define WEBKIT_COMMON_FILEAPI_FILE_SYSTEM_TYPES_H_
 
+#include "third_party/WebKit/public/platform/WebFileSystem.h"
 #include "third_party/WebKit/public/platform/WebFileSystemType.h"
 
 namespace fileapi {
diff --git a/webkit/common/fileapi/file_system_util.h b/webkit/common/fileapi/file_system_util.h
index 2185d3a..aed0800 100644
--- a/webkit/common/fileapi/file_system_util.h
+++ b/webkit/common/fileapi/file_system_util.h
@@ -14,19 +14,19 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileError.h"
 #include "webkit/common/fileapi/file_system_types.h"
 #include "webkit/common/quota/quota_types.h"
-#include "webkit/common/webkit_common_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 class GURL;
 
 namespace fileapi {
 
-WEBKIT_COMMON_EXPORT extern const char kPersistentDir[];
-WEBKIT_COMMON_EXPORT extern const char kTemporaryDir[];
-WEBKIT_COMMON_EXPORT extern const char kExternalDir[];
-WEBKIT_COMMON_EXPORT extern const char kIsolatedDir[];
-WEBKIT_COMMON_EXPORT extern const char kTestDir[];
+extern const char kPersistentDir[];
+extern const char kTemporaryDir[];
+extern const char kExternalDir[];
+extern const char kIsolatedDir[];
+extern const char kTestDir[];
 
-class WEBKIT_COMMON_EXPORT VirtualPath {
+class WEBKIT_STORAGE_EXPORT VirtualPath {
  public:
   static const base::FilePath::CharType kRoot[];
   static const base::FilePath::CharType kSeparator;
@@ -67,7 +67,7 @@ class WEBKIT_COMMON_EXPORT VirtualPath {
 // returns URL without the filesystem ID.
 //
 // |type| needs to be public type as the returned URI is given to the renderer.
-WEBKIT_COMMON_EXPORT GURL GetFileSystemRootURI(const GURL& origin_url,
+WEBKIT_STORAGE_EXPORT GURL GetFileSystemRootURI(const GURL& origin_url,
                                          FileSystemType type);
 
 // Returns the name for the filesystem that is specified by a pair of
@@ -81,25 +81,25 @@ WEBKIT_COMMON_EXPORT GURL GetFileSystemRootURI(const GURL& origin_url,
 // Example:
 //   The name for a TEMPORARY filesystem of "http://www.example.com:80/"
 //   should look like: "http_www.example.host_80:temporary"
-WEBKIT_COMMON_EXPORT std::string GetFileSystemName(const GURL& origin_url,
+WEBKIT_STORAGE_EXPORT std::string GetFileSystemName(const GURL& origin_url,
                                              FileSystemType type);
 
 // Converts FileSystemType |type| to/from the StorageType |storage_type| that
 // is used for the unified quota system.
 // (Basically this naively maps TEMPORARY storage type to TEMPORARY filesystem
 // type, PERSISTENT storage type to PERSISTENT filesystem type and vice versa.)
-WEBKIT_COMMON_EXPORT FileSystemType QuotaStorageTypeToFileSystemType(
+WEBKIT_STORAGE_EXPORT FileSystemType QuotaStorageTypeToFileSystemType(
     quota::StorageType storage_type);
-WEBKIT_COMMON_EXPORT quota::StorageType FileSystemTypeToQuotaStorageType(
+WEBKIT_STORAGE_EXPORT quota::StorageType FileSystemTypeToQuotaStorageType(
     FileSystemType type);
 
 // Returns the string representation of the given filesystem |type|.
 // Returns an empty string if the |type| is invalid.
-WEBKIT_COMMON_EXPORT std::string GetFileSystemTypeString(FileSystemType type);
+WEBKIT_STORAGE_EXPORT std::string GetFileSystemTypeString(FileSystemType type);
 
 // Sets type to FileSystemType enum that corresponds to the string name.
 // Returns false if the |type_string| is invalid.
-WEBKIT_COMMON_EXPORT bool GetFileSystemPublicType(
+WEBKIT_STORAGE_EXPORT bool GetFileSystemPublicType(
     std::string type_string,
     WebKit::WebFileSystemType* type);
 
@@ -111,20 +111,20 @@ WEBKIT_COMMON_EXPORT bool GetFileSystemPublicType(
 //
 // TODO(tzik): Replace CreateFilePath and FilePathToString in
 // third_party/leveldatabase/env_chromium.cc with them.
-WEBKIT_COMMON_EXPORT std::string FilePathToString(
+WEBKIT_STORAGE_EXPORT std::string FilePathToString(
     const base::FilePath& file_path);
 
 // Decode a file path from |file_path_string|.
-WEBKIT_COMMON_EXPORT base::FilePath StringToFilePath(
+WEBKIT_STORAGE_EXPORT base::FilePath StringToFilePath(
     const std::string& file_path_string);
 
 // File error conversion
-WEBKIT_COMMON_EXPORT WebKit::WebFileError PlatformFileErrorToWebFileError(
+WEBKIT_STORAGE_EXPORT WebKit::WebFileError PlatformFileErrorToWebFileError(
     base::PlatformFileError error_code);
 
 // Generate a file system name for the given arguments. Should only be used by
 // platform apps.
-WEBKIT_COMMON_EXPORT std::string GetIsolatedFileSystemName(
+WEBKIT_STORAGE_EXPORT std::string GetIsolatedFileSystemName(
     const GURL& origin_url,
     const std::string& filesystem_id);
 
@@ -132,21 +132,21 @@ WEBKIT_COMMON_EXPORT std::string GetIsolatedFileSystemName(
 // platform apps. This function will return false if the file system name is
 // not of the form {origin}:Isolated_{id}, and will also check that there is an
 // origin and id present. It will not check that the origin or id are valid.
-WEBKIT_COMMON_EXPORT bool CrackIsolatedFileSystemName(
+WEBKIT_STORAGE_EXPORT bool CrackIsolatedFileSystemName(
     const std::string& filesystem_name,
     std::string* filesystem_id);
 
 // Returns the root URI for an isolated filesystem for origin |origin_url|
 // and |filesystem_id|. If the |optional_root_name| is given the resulting
 // root URI will point to the subfolder within the isolated filesystem.
-WEBKIT_COMMON_EXPORT std::string GetIsolatedFileSystemRootURIString(
+WEBKIT_STORAGE_EXPORT std::string GetIsolatedFileSystemRootURIString(
     const GURL& origin_url,
     const std::string& filesystem_id,
     const std::string& optional_root_name);
 
 // Returns the root URI for an external filesystem for origin |origin_url|
 // and |mount_name|.
-WEBKIT_COMMON_EXPORT std::string GetExternalFileSystemRootURIString(
+WEBKIT_STORAGE_EXPORT std::string GetExternalFileSystemRootURIString(
     const GURL& origin_url,
     const std::string& mount_name);
 
diff --git a/webkit/common/fileapi/webkit_common_fileapi.gypi b/webkit/common/fileapi/webkit_common_fileapi.gypi
new file mode 100644
index 0000000..ce7c717
--- /dev/null
+++ b/webkit/common/fileapi/webkit_common_fileapi.gypi
@@ -0,0 +1,14 @@
+# Copyright 2013 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.
+
+{
+  'variables': {
+    'webkit_common_fileapi_sources': [
+      '../common/fileapi/directory_entry.h',
+      '../common/fileapi/file_system_types.h',
+      '../common/fileapi/file_system_util.cc',
+      '../common/fileapi/file_system_util.h',
+    ],
+  },
+}
diff --git a/webkit/common/quota/quota_status_code.h b/webkit/common/quota/quota_status_code.h
index 6cffa91..8cd00d9 100644
--- a/webkit/common/quota/quota_status_code.h
+++ b/webkit/common/quota/quota_status_code.h
@@ -6,7 +6,7 @@
 #define WEBKIT_COMMON_QUOTA_QUOTA_STATUS_CODE_H_
 
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageQuotaError.h"
-#include "webkit/common/webkit_common_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace quota {
 
@@ -20,7 +20,7 @@ enum QuotaStatusCode {
   kQuotaStatusUnknown = -1,
 };
 
-WEBKIT_COMMON_EXPORT const char* QuotaStatusCodeToString(
+WEBKIT_STORAGE_EXPORT const char* QuotaStatusCodeToString(
     QuotaStatusCode status);
 
 }  // namespace quota
diff --git a/webkit/common/quota/webkit_common_quota.gypi b/webkit/common/quota/webkit_common_quota.gypi
new file mode 100644
index 0000000..bd3ab77
--- /dev/null
+++ b/webkit/common/quota/webkit_common_quota.gypi
@@ -0,0 +1,13 @@
+# Copyright 2013 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.
+
+{
+  'variables': {
+    'webkit_common_quota_sources': [
+      '../common/quota/quota_status_code.cc',
+      '../common/quota/quota_status_code.h',
+      '../common/quota/quota_types.h',
+    ],
+  },
+}
diff --git a/webkit/common/webkit_common.gypi b/webkit/common/webkit_common.gypi
index b64eb0b..950c265 100644
--- a/webkit/common/webkit_common.gypi
+++ b/webkit/common/webkit_common.gypi
@@ -3,6 +3,27 @@
 # found in the LICENSE file.
 
 {
+  'includes': [
+    '../common/blob/webkit_common_blob.gypi',
+    '../common/database/webkit_common_database.gypi',
+    '../common/dom_storage/webkit_common_dom_storage.gypi',
+    '../common/fileapi/webkit_common_fileapi.gypi',
+    '../common/quota/webkit_common_quota.gypi',
+  ],
+  # TODO(michaeln): Have webkit_browser target and deprecate old gypis like
+  # webkit_storage.gypi.
+  'variables': {
+    'webkit_common_storage_sources': [
+      '<@(webkit_common_blob_sources)',
+      '<@(webkit_common_database_sources)',
+      '<@(webkit_common_dom_storage_sources)',
+      '<@(webkit_common_fileapi_sources)',
+      '<@(webkit_common_quota_sources)',
+      '../common/appcache/appcache_interfaces.cc',
+      '../common/appcache/appcache_interfaces.h',
+    ],
+  },
+
   'targets': [
     {
       'target_name': 'webkit_common',
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 31c211d..66a26b2 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -171,17 +171,16 @@
         '<(DEPTH)/ui/ui.gyp:ui_resources',
         '<(DEPTH)/url/url.gyp:url_lib',
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
-        '<(DEPTH)/webkit/base/webkit_base.gyp:webkit_base',
         '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
         '<(DEPTH)/webkit/plugins/webkit_plugins.gyp:plugins_common',
         '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
-        '<(DEPTH)/webkit/storage_browser.gyp:webkit_storage_browser',
-        '<(DEPTH)/webkit/storage_common.gyp:webkit_storage_common',
         'glue_common',
         'plugins',
+        'webkit_base',
         'webkit_common',
         'webkit_media',
         'webkit_resources',
+        'webkit_storage',
         'webkit_strings',
       ],
       'include_dirs': [
diff --git a/webkit/plugins/webkit_plugins.gypi b/webkit/plugins/webkit_plugins.gypi
index f1a217c..e743369 100644
--- a/webkit/plugins/webkit_plugins.gypi
+++ b/webkit/plugins/webkit_plugins.gypi
@@ -35,13 +35,13 @@
         '<(DEPTH)/ui/ui.gyp:ui_resources',
         '<(DEPTH)/url/url.gyp:url_lib',
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
-        '<(DEPTH)/webkit/base/webkit_base.gyp:webkit_base',
         '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
         '<(DEPTH)/webkit/plugins/webkit_plugins.gyp:plugins_common',
         '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
-        '<(DEPTH)/webkit/storage_common.gyp:webkit_storage_common',
         'glue_common',
+        'webkit_base',
         'webkit_common',
+        'webkit_storage',
       ],
       'sources': [
         # This list contains all .h, .cc, and .mm files in glue except for
diff --git a/webkit/storage/webkit_storage.gypi b/webkit/storage/webkit_storage.gypi
new file mode 100644
index 0000000..fd487e6
--- /dev/null
+++ b/webkit/storage/webkit_storage.gypi
@@ -0,0 +1,58 @@
+# Copyright (c) 2012 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.
+
+{
+  'includes': [
+    # TODO(kinuko): Deprecate this when we have a new target for
+    # webkit_browser.  crbug.com/239710
+    '../browser/webkit_browser.gypi',
+    '../common/webkit_common.gypi',
+  ],
+  'targets': [
+    {
+      'target_name': 'webkit_storage',
+      'type': '<(component)',
+      'variables': { 'enable_wexit_time_destructors': 1, },
+      'dependencies': [
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/base/base.gyp:base_i18n',
+        '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '<(DEPTH)/net/net.gyp:net',
+        '<(DEPTH)/sql/sql.gyp:sql',
+        '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
+        '<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+        '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
+        '<(DEPTH)/url/url.gyp:url_lib',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_base',
+      ],
+      'defines': ['WEBKIT_STORAGE_IMPLEMENTATION'],
+      'sources': [
+        '../storage/webkit_storage_export.h',
+
+        # TODO(kinuko): Deprecate them when we have new targets for
+        # browser|common|renderer.  crbug.com/239710
+        '<@(webkit_browser_storage_sources)',
+        '<@(webkit_common_storage_sources)',
+        '../renderer/appcache/appcache_frontend_impl.cc',
+        '../renderer/appcache/appcache_frontend_impl.h',
+        '../renderer/appcache/web_application_cache_host_impl.cc',
+        '../renderer/appcache/web_application_cache_host_impl.h',
+        '../renderer/dom_storage/dom_storage_cached_area.cc',
+        '../renderer/dom_storage/dom_storage_cached_area.h',
+        '../renderer/dom_storage/dom_storage_proxy.h',
+        '../renderer/fileapi/webfilewriter_base.cc',
+        '../renderer/fileapi/webfilewriter_base.h',
+      ],
+      'conditions': [
+        ['chromeos==1', {
+          'sources': [
+            '<@(webkit_browser_fileapi_chromeos_sources)',
+          ],
+        }],
+      ],
+      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+      'msvs_disabled_warnings': [ 4267, ],
+    },
+  ],
+}
diff --git a/webkit/storage_browser.gyp b/webkit/storage_browser.gyp
deleted file mode 100644
index b54070d..0000000
--- a/webkit/storage_browser.gyp
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 2013 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.
-
-{
-  'targets': [
-    {
-      'target_name': 'webkit_storage_browser',
-      'type': '<(component)',
-      'variables': { 'enable_wexit_time_destructors': 1, },
-      'dependencies': [
-        '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/base/base.gyp:base_i18n',
-        '<(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/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
-        '<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
-        '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
-        '<(DEPTH)/webkit/base/webkit_base.gyp:webkit_base',
-        '<(DEPTH)/webkit/storage_common.gyp:webkit_storage_common',
-      ],
-      'defines': ['WEBKIT_STORAGE_IMPLEMENTATION'],
-      'sources': [
-        # TODO(kinuko): Fix this export.
-        'storage/webkit_storage_export.h',
-        'browser/appcache/appcache.cc',
-        'browser/appcache/appcache.h',
-        'browser/appcache/appcache_backend_impl.cc',
-        'browser/appcache/appcache_backend_impl.h',
-        'browser/appcache/appcache_database.cc',
-        'browser/appcache/appcache_database.h',
-        'browser/appcache/appcache_disk_cache.cc',
-        'browser/appcache/appcache_disk_cache.h',
-        'browser/appcache/appcache_entry.h',
-        'browser/appcache/appcache_group.cc',
-        'browser/appcache/appcache_group.h',
-        'browser/appcache/appcache_histograms.cc',
-        'browser/appcache/appcache_histograms.h',
-        'browser/appcache/appcache_host.cc',
-        'browser/appcache/appcache_host.h',
-        'browser/appcache/appcache_interceptor.cc',
-        'browser/appcache/appcache_interceptor.h',
-        'browser/appcache/appcache_policy.h',
-        'browser/appcache/appcache_quota_client.cc',
-        'browser/appcache/appcache_quota_client.h',
-        'browser/appcache/appcache_request_handler.cc',
-        'browser/appcache/appcache_request_handler.h',
-        'browser/appcache/appcache_response.cc',
-        'browser/appcache/appcache_response.h',
-        'browser/appcache/appcache_service.cc',
-        'browser/appcache/appcache_service.h',
-        'browser/appcache/appcache_storage.cc',
-        'browser/appcache/appcache_storage.h',
-        'browser/appcache/appcache_storage_impl.cc',
-        'browser/appcache/appcache_storage_impl.h',
-        'browser/appcache/appcache_working_set.cc',
-        'browser/appcache/appcache_working_set.h',
-        'browser/appcache/appcache_update_job.cc',
-        'browser/appcache/appcache_update_job.h',
-        'browser/appcache/appcache_url_request_job.cc',
-        'browser/appcache/appcache_url_request_job.h',
-        'browser/appcache/manifest_parser.cc',
-        'browser/appcache/manifest_parser.h',
-        'browser/appcache/view_appcache_internals_job.h',
-        'browser/appcache/view_appcache_internals_job.cc',
-        'browser/blob/blob_data_handle.cc',
-        'browser/blob/blob_data_handle.h',
-        'browser/blob/blob_storage_context.cc',
-        'browser/blob/blob_storage_context.h',
-        'browser/blob/blob_storage_controller.cc',
-        'browser/blob/blob_storage_controller.h',
-        'browser/blob/blob_storage_host.cc',
-        'browser/blob/blob_storage_host.h',
-        'browser/blob/blob_url_request_job.cc',
-        'browser/blob/blob_url_request_job.h',
-        'browser/blob/blob_url_request_job_factory.cc',
-        'browser/blob/blob_url_request_job_factory.h',
-        'browser/blob/local_file_stream_reader.cc',
-        'browser/blob/local_file_stream_reader.h',
-        'browser/blob/view_blob_internals_job.cc',
-        'browser/blob/view_blob_internals_job.h',
-        'browser/database/database_quota_client.cc',
-        'browser/database/database_quota_client.h',
-        'browser/database/database_tracker.cc',
-        'browser/database/database_tracker.h',
-        'browser/database/database_util.cc',
-        'browser/database/database_util.h',
-        'browser/database/databases_table.cc',
-        'browser/database/databases_table.h',
-        'browser/database/vfs_backend.cc',
-        'browser/database/vfs_backend.h',
-        'browser/dom_storage/dom_storage_area.cc',
-        'browser/dom_storage/dom_storage_area.h',
-        'browser/dom_storage/dom_storage_context.cc',
-        'browser/dom_storage/dom_storage_context.h',
-        'browser/dom_storage/dom_storage_database.cc',
-        'browser/dom_storage/dom_storage_database.h',
-        'browser/dom_storage/dom_storage_database_adapter.h',
-        'browser/dom_storage/dom_storage_host.cc',
-        'browser/dom_storage/dom_storage_host.h',
-        'browser/dom_storage/dom_storage_namespace.cc',
-        'browser/dom_storage/dom_storage_namespace.h',
-        'browser/dom_storage/dom_storage_session.cc',
-        'browser/dom_storage/dom_storage_session.h',
-        'browser/dom_storage/dom_storage_task_runner.cc',
-        'browser/dom_storage/dom_storage_task_runner.h',
-        'browser/dom_storage/local_storage_database_adapter.cc',
-        'browser/dom_storage/local_storage_database_adapter.h',
-        'browser/dom_storage/session_storage_database.cc',
-        'browser/dom_storage/session_storage_database.h',
-        'browser/dom_storage/session_storage_database_adapter.cc',
-        'browser/dom_storage/session_storage_database_adapter.h',
-        'browser/fileapi/async_file_util.h',
-        'browser/fileapi/async_file_util_adapter.cc',
-        'browser/fileapi/async_file_util_adapter.h',
-        'browser/fileapi/copy_or_move_file_validator.h',
-        'browser/fileapi/copy_or_move_operation_delegate.cc',
-        'browser/fileapi/copy_or_move_operation_delegate.h',
-        'browser/fileapi/external_mount_points.cc',
-        'browser/fileapi/external_mount_points.h',
-        'browser/fileapi/file_observers.h',
-        'browser/fileapi/file_permission_policy.cc',
-        'browser/fileapi/file_permission_policy.h',
-        'browser/fileapi/file_stream_writer.h',
-        'browser/fileapi/file_system_context.cc',
-        'browser/fileapi/file_system_context.h',
-        'browser/fileapi/file_system_dir_url_request_job.cc',
-        'browser/fileapi/file_system_dir_url_request_job.h',
-        'browser/fileapi/file_system_file_stream_reader.cc',
-        'browser/fileapi/file_system_file_stream_reader.h',
-        'browser/fileapi/file_system_file_util.cc',
-        'browser/fileapi/file_system_file_util.h',
-        'browser/fileapi/file_system_mount_point_provider.h',
-        'browser/fileapi/file_system_operation.h',
-        'browser/fileapi/file_system_operation_context.cc',
-        'browser/fileapi/file_system_operation_context.h',
-        'browser/fileapi/file_system_operation_runner.cc',
-        'browser/fileapi/file_system_operation_runner.h',
-        'browser/fileapi/file_system_options.cc',
-        'browser/fileapi/file_system_options.h',
-        'browser/fileapi/file_system_quota_client.cc',
-        'browser/fileapi/file_system_quota_client.h',
-        'browser/fileapi/file_system_quota_util.h',
-        'browser/fileapi/file_system_task_runners.cc',
-        'browser/fileapi/file_system_task_runners.h',
-        'browser/fileapi/file_system_url.cc',
-        'browser/fileapi/file_system_url.h',
-        'browser/fileapi/file_system_url_request_job.cc',
-        'browser/fileapi/file_system_url_request_job.h',
-        'browser/fileapi/file_system_url_request_job_factory.cc',
-        'browser/fileapi/file_system_url_request_job_factory.h',
-        'browser/fileapi/file_system_usage_cache.cc',
-        'browser/fileapi/file_system_usage_cache.h',
-        'browser/fileapi/file_writer_delegate.cc',
-        'browser/fileapi/file_writer_delegate.h',
-        'browser/fileapi/isolated_context.cc',
-        'browser/fileapi/isolated_context.h',
-        'browser/fileapi/isolated_file_util.cc',
-        'browser/fileapi/isolated_file_util.h',
-        'browser/fileapi/isolated_mount_point_provider.cc',
-        'browser/fileapi/isolated_mount_point_provider.h',
-        'browser/fileapi/local_file_stream_writer.cc',
-        'browser/fileapi/local_file_stream_writer.h',
-        'browser/fileapi/local_file_system_operation.cc',
-        'browser/fileapi/local_file_system_operation.h',
-        'browser/fileapi/local_file_util.cc',
-        'browser/fileapi/local_file_util.h',
-        'browser/fileapi/mount_points.cc',
-        'browser/fileapi/mount_points.h',
-        'browser/fileapi/native_file_util.cc',
-        'browser/fileapi/native_file_util.h',
-        'browser/fileapi/obfuscated_file_util.cc',
-        'browser/fileapi/obfuscated_file_util.h',
-        'browser/fileapi/open_file_system_mode.h',
-        'browser/fileapi/recursive_operation_delegate.cc',
-        'browser/fileapi/recursive_operation_delegate.h',
-        'browser/fileapi/remote_file_system_proxy.h',
-        'browser/fileapi/remove_operation_delegate.cc',
-        'browser/fileapi/remove_operation_delegate.h',
-        'browser/fileapi/sandbox_directory_database.cc',
-        'browser/fileapi/sandbox_directory_database.h',
-        'browser/fileapi/sandbox_file_stream_writer.cc',
-        'browser/fileapi/sandbox_file_stream_writer.h',
-        'browser/fileapi/sandbox_isolated_origin_database.cc',
-        'browser/fileapi/sandbox_isolated_origin_database.h',
-        'browser/fileapi/sandbox_mount_point_provider.cc',
-        'browser/fileapi/sandbox_mount_point_provider.h',
-        'browser/fileapi/sandbox_origin_database.cc',
-        'browser/fileapi/sandbox_origin_database.h',
-        'browser/fileapi/sandbox_origin_database_interface.cc',
-        'browser/fileapi/sandbox_origin_database_interface.h',
-        'browser/fileapi/sandbox_quota_observer.cc',
-        'browser/fileapi/sandbox_quota_observer.h',
-        'browser/fileapi/syncable/file_change.cc',
-        'browser/fileapi/syncable/file_change.h',
-        'browser/fileapi/syncable/local_file_change_tracker.cc',
-        'browser/fileapi/syncable/local_file_change_tracker.h',
-        'browser/fileapi/syncable/local_file_sync_context.cc',
-        'browser/fileapi/syncable/local_file_sync_context.h',
-        'browser/fileapi/syncable/local_file_sync_status.cc',
-        'browser/fileapi/syncable/local_file_sync_status.h',
-        'browser/fileapi/syncable/local_origin_change_observer.h',
-        'browser/fileapi/syncable/sync_action.h',
-        'browser/fileapi/syncable/sync_callbacks.h',
-        'browser/fileapi/syncable/sync_direction.h',
-        'browser/fileapi/syncable/sync_file_metadata.cc',
-        'browser/fileapi/syncable/sync_file_metadata.h',
-        'browser/fileapi/syncable/sync_file_status.h',
-        'browser/fileapi/syncable/sync_file_type.h',
-        'browser/fileapi/syncable/sync_status_code.cc',
-        'browser/fileapi/syncable/sync_status_code.h',
-        'browser/fileapi/syncable/syncable_file_operation_runner.cc',
-        'browser/fileapi/syncable/syncable_file_operation_runner.h',
-        'browser/fileapi/syncable/syncable_file_system_operation.cc',
-        'browser/fileapi/syncable/syncable_file_system_operation.h',
-        'browser/fileapi/syncable/syncable_file_system_util.cc',
-        'browser/fileapi/syncable/syncable_file_system_util.h',
-        'browser/fileapi/task_runner_bound_observer_list.h',
-        'browser/fileapi/test_mount_point_provider.cc',
-        'browser/fileapi/test_mount_point_provider.h',
-        'browser/fileapi/transient_file_util.cc',
-        'browser/fileapi/transient_file_util.h',
-        'browser/fileapi/upload_file_system_file_element_reader.cc',
-        'browser/fileapi/upload_file_system_file_element_reader.h',
-        'browser/quota/quota_callbacks.h',
-        'browser/quota/quota_client.h',
-        'browser/quota/quota_database.cc',
-        'browser/quota/quota_database.h',
-        'browser/quota/quota_manager.cc',
-        'browser/quota/quota_manager.h',
-        'browser/quota/quota_task.cc',
-        'browser/quota/quota_task.h',
-        'browser/quota/quota_temporary_storage_evictor.cc',
-        'browser/quota/quota_temporary_storage_evictor.h',
-        'browser/quota/special_storage_policy.cc',
-        'browser/quota/special_storage_policy.h',
-        'browser/quota/usage_tracker.cc',
-        'browser/quota/usage_tracker.h',
-      ],
-      'conditions': [
-        ['chromeos==1', {
-          'sources': [
-            'browser/chromeos/fileapi/async_file_stream.h',
-            'browser/chromeos/fileapi/cros_mount_point_provider.cc',
-            'browser/chromeos/fileapi/cros_mount_point_provider.h',
-            'browser/chromeos/fileapi/file_access_permissions.cc',
-            'browser/chromeos/fileapi/file_access_permissions.h',
-            'browser/chromeos/fileapi/file_util_async.h',
-            'browser/chromeos/fileapi/remote_file_system_operation.cc',
-            'browser/chromeos/fileapi/remote_file_system_operation.h',
-            'browser/chromeos/fileapi/remote_file_stream_writer.cc',
-            'browser/chromeos/fileapi/remote_file_stream_writer.h',
-          ],
-        }],
-      ],
-      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-      'msvs_disabled_warnings': [ 4267, ],
-    },
-  ],
-}
diff --git a/webkit/storage_common.gyp b/webkit/storage_common.gyp
deleted file mode 100644
index b95b836..0000000
--- a/webkit/storage_common.gyp
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2013 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.
-
-{
-  'targets': [
-    {
-      'target_name': 'webkit_storage_common',
-      'type': '<(component)',
-      'variables': { 'enable_wexit_time_destructors': 1, },
-      'dependencies': [
-        '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
-        '<(DEPTH)/net/net.gyp:net',
-        '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
-        '<(DEPTH)/webkit/base/webkit_base.gyp:webkit_base',
-      ],
-      'defines': ['WEBKIT_COMMON_IMPLEMENTATION'],
-      'sources': [
-        'common/webkit_common_export.h',
-        'common/appcache/appcache_interfaces.cc',
-        'common/appcache/appcache_interfaces.h',
-        'common/blob/blob_data.cc',
-        'common/blob/blob_data.h',
-        'common/blob/scoped_file.cc',
-        'common/blob/scoped_file.h',
-        'common/blob/shareable_file_reference.cc',
-        'common/blob/shareable_file_reference.h',
-        'common/database/database_connections.cc',
-        'common/database/database_connections.h',
-        'common/dom_storage/dom_storage_map.cc',
-        'common/dom_storage/dom_storage_map.h',
-        'common/dom_storage/dom_storage_types.cc',
-        'common/dom_storage/dom_storage_types.h',
-        'common/fileapi/directory_entry.h',
-        'common/fileapi/file_system_types.h',
-        'common/fileapi/file_system_util.cc',
-        'common/fileapi/file_system_util.h',
-        'common/quota/quota_status_code.cc',
-        'common/quota/quota_status_code.h',
-        'common/quota/quota_types.h',
-      ],
-      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-      'msvs_disabled_warnings': [ 4267, ],
-    },
-  ],
-}
diff --git a/webkit/storage_renderer.gyp b/webkit/storage_renderer.gyp
deleted file mode 100644
index ae456fe..0000000
--- a/webkit/storage_renderer.gyp
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2013 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.
-
-{
-  'targets': [
-    {
-      'target_name': 'webkit_storage_renderer',
-      'type': '<(component)',
-      'variables': { 'enable_wexit_time_destructors': 1, },
-      'dependencies': [
-        '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
-        '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
-        '<(DEPTH)/webkit/base/webkit_base.gyp:webkit_base',
-        '<(DEPTH)/webkit/storage_common.gyp:webkit_storage_common',
-      ],
-      'defines': ['WEBKIT_STORAGE_IMPLEMENTATION'],
-      'sources': [
-        # TODO(kinuko): Fix this export.
-        'storage/webkit_storage_export.h',
-        'renderer/appcache/appcache_frontend_impl.cc',
-        'renderer/appcache/appcache_frontend_impl.h',
-        'renderer/appcache/web_application_cache_host_impl.cc',
-        'renderer/appcache/web_application_cache_host_impl.h',
-        'renderer/dom_storage/dom_storage_cached_area.cc',
-        'renderer/dom_storage/dom_storage_cached_area.h',
-        'renderer/dom_storage/dom_storage_proxy.h',
-        'renderer/fileapi/webfilewriter_base.cc',
-        'renderer/fileapi/webfilewriter_base.h',
-      ],
-      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-      'msvs_disabled_warnings': [ 4267, ],
-    },
-  ],
-}
diff --git a/webkit/support/webkit_support.gyp b/webkit/support/webkit_support.gyp
index 90de6d5..9e3f90f 100644
--- a/webkit/support/webkit_support.gyp
+++ b/webkit/support/webkit_support.gyp
@@ -10,10 +10,11 @@
     ['OS != "ios"', {
       'includes': [
         '../../build/win_precompile.gypi',
+        '../base/webkit_base.gypi',
         '../glue/webkit_glue.gypi',
         '../plugins/webkit_plugins.gypi',
         '../renderer/media/webkit_media.gypi',
-        '../common/webkit_common.gypi',
+        '../storage/webkit_storage.gypi',
         'webkit_support.gypi',
       ],
     }],
diff --git a/webkit/support/webkit_support.gypi b/webkit/support/webkit_support.gypi
index 2634962..0740a24 100644
--- a/webkit/support/webkit_support.gypi
+++ b/webkit/support/webkit_support.gypi
@@ -23,20 +23,18 @@
         '<(DEPTH)/ui/gl/gl.gyp:gl',
         '<(DEPTH)/ui/ui.gyp:shell_dialogs',
         '<(DEPTH)/ui/ui.gyp:ui',
-        '<(DEPTH)/webkit/base/webkit_base.gyp:webkit_base',
         '<(DEPTH)/webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
         '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
         '<(DEPTH)/webkit/plugins/webkit_plugins.gyp:plugins_common',
         '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_bindings',
         '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
-        '<(DEPTH)/webkit/storage_browser.gyp:webkit_storage_browser',
-        '<(DEPTH)/webkit/storage_common.gyp:webkit_storage_common',
-        '<(DEPTH)/webkit/storage_renderer.gyp:webkit_storage_renderer',
         'glue',
         'glue_common',
         'plugins',
+        'webkit_base',
         'webkit_common',
         'webkit_media',
+        'webkit_storage',
         'webkit_support_common',
       ],
       'include_dirs': [