2nd try: 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.

Original review: https://codereview.chromium.org/15716007/

BUG=239109
TBR=jamesr@chromium.org,mnaganov@chromium.org,thestig@chromium.org,avi@chromium.org
NOTRY=true

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

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

6 files changed, 16 insertions, 7 deletions

diff --git a/content/child/fileapi/webfilesystem_callback_adapters.cc b/content/child/fileapi/webfilesystem_callback_adapters.cc
index 24538ef..b061a22 100644
--- a/content/child/fileapi/webfilesystem_callback_adapters.cc
+++ b/content/child/fileapi/webfilesystem_callback_adapters.cc
@@ -12,6 +12,7 @@
 #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 0ebc992..f2732e3 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -1156,8 +1156,9 @@
         '../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 784371b..f29d27d 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 af7ef55..f463700 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -372,9 +372,10 @@
         '../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 9008ba8..1f1a0d7 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -20,6 +20,8 @@
     '../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 39e14bc..33e0713 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -171,8 +171,10 @@
             '../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', {
@@ -564,16 +566,18 @@
             '../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', {