Move storage-related files from webkit/ to new top-level directory storage/

storage/storage.gyp

Index: storage/storage.gyp
diff --git a/webkit/storage_browser.gyp b/storage/storage.gyp
similarity index 79%
rename from webkit/storage_browser.gyp
rename to storage/storage.gyp
index f2a04bab33e0f194f7c8dd323d2b1ffd8b1748e5..f326e29e4c18277debbb2f1ed8b61c0b58a746bd 100644
--- a/webkit/storage_browser.gyp
+++ b/storage/storage.gyp
@@ -8,6 +8,64 @@
   },
   'targets': [
     {
+      # GN version: //webkit/common:common",
+      'target_name': 'webkit_common',
+      'type': '<(component)',
+      'variables': { 'enable_wexit_time_destructors': 1, },
+      'defines': [
+        'STORAGE_IMPLEMENTATION',
+      ],
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../url/url.gyp:url_lib',
+      ],
+      'sources': [
+        'common/data_element.cc',
+        'common/data_element.h',
+        'common/storage_export.h',
+      ],
+    },
+    {
+      # GN version: //webkit/common:storage
+      '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)/net/net.gyp:net',
+        '<(DEPTH)/url/url.gyp:url_lib',
+        '<(DEPTH)/storage/storage.gyp:webkit_common',
+      ],
+      'defines': ['STORAGE_IMPLEMENTATION'],
+      'sources': [
+        'common/webkit_storage_common_export.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/database/database_identifier.cc',
+        'common/database/database_identifier.h',
+        'common/fileapi/directory_entry.cc',
+        'common/fileapi/directory_entry.h',
+        'common/fileapi/file_system_info.cc',
+        'common/fileapi/file_system_info.h',
+        'common/fileapi/file_system_mount_option.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, ],
+    },
+    {
       # GN version: //webkit/browser:storage
       'target_name': 'webkit_storage_browser',
       'type': '<(component)',
@@ -21,12 +79,11 @@
         '<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
         '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
         '<(DEPTH)/url/url.gyp:url_lib',
-        '<(DEPTH)/webkit/common/webkit_common.gyp:webkit_common',
-        '<(DEPTH)/webkit/storage_common.gyp:webkit_storage_common',
+        '<(DEPTH)/storage/storage.gyp:webkit_common',
+        '<(DEPTH)/storage/storage.gyp:webkit_storage_common',
       ],
-      'defines': ['WEBKIT_STORAGE_BROWSER_IMPLEMENTATION'],
+      'defines': ['STORAGE_IMPLEMENTATION'],
       'sources': [
-        'browser/webkit_storage_browser_export.h',
         'browser/blob/blob_data_handle.cc',
         'browser/blob/blob_data_handle.h',
         'browser/blob/blob_storage_context.cc',
@@ -192,7 +249,7 @@
       ],
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/webkit/storage_common.gyp:webkit_storage_common',
+        '<(DEPTH)/storage/storage.gyp:webkit_storage_common',
         'webkit_storage_browser',
       ],
     },