Migrate webkit/browser/ to storage/browser/

using TBR because Darin told me he defers to James' judgement. Using NOTRY because there is one presubmit error (dump_file_system.cc was moved and it spews printf).

BUG=338338
TBR=darin@chromium.org
NOTRY=true

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

Cr-Commit-Position: refs/heads/master@{#293547}

BUILD.gn

@@ -61,6 +61,7 @@ group("root") {
     "//sandbox",
     "//sdch",
     "//skia",
+    "//storage/browser",
     "//sql",
     "//sync",
     "//third_party/WebKit/public:all_blink",
@@ -126,7 +127,6 @@ group("root") {
     "//ui/wm",
     "//url",
     "//v8:v8",
-    "//webkit/browser:storage",
   ]
 
   if (!is_win) {
@@ -221,14 +221,14 @@ group("root") {
       # Not tested on Android yet:
       "//google_apis/gcm",
       "//remoting/client/plugin",
+      "//storage/browser",
       "//third_party/cld_2",
       "//third_party/libaddressinput",
       "//third_party/ffmpeg",
       "//ui:ui_unittests",
       "//ui/app_list",
       "//ui/web_dialogs",
       "//ui/wm",
-      "//webkit/browser:storage",
     ]
   }
 

android_webview/native/webview_native.gyp

@@ -19,11 +19,11 @@
         '../../media/media.gyp:player_android',
         '../../net/net.gyp:net',
         '../../skia/skia.gyp:skia',
+        '../../storage/storage_browser.gyp:storage',
         '../../storage/storage_common.gyp:storage_common',
         '../../ui/base/ui_base.gyp:ui_base',
         '../../ui/gfx/gfx.gyp:gfx',
         '../../ui/gfx/gfx.gyp:gfx_geometry',
-        '../../webkit/storage_browser.gyp:storage',
         '../../third_party/boringssl/boringssl.gyp:boringssl',
         'android_webview_native_jni',
       ],

chrome/browser/BUILD.gn

@@ -166,6 +166,7 @@ static_library("browser") {
       "//mojo/system",
       "//net:extras",
       "//net:net_with_v8",
+      "//storage/browser",
       "//storage/common",
       "//third_party/WebKit/public:resources",
       "//third_party/expat",
@@ -180,7 +181,6 @@ static_library("browser") {
       "//ui/surface",
       "//ui/web_dialogs",
       "//v8",
-      "//webkit/browser:storage",
       ## TODO(tonyg): Remove this dependency (crbug.com/280157).
       #"../testing/perf/perf_test.gyp:*",  TODO(GYP)
     ]

chrome/browser/extensions/BUILD.gn

@@ -72,7 +72,7 @@ static_library("extensions") {
     "//ui/resources",
     "//ui/strings",
     "//url",
-    "//webkit/browser:storage",
+    "//storage/browser",
   ]
 
   forward_dependent_configs_from = [

chrome/browser/ui/BUILD.gn

@@ -95,6 +95,8 @@ static_library("ui") {
       "//media",
       "//mojo/system",
       "//net:net_with_v8",
+      "//storage/browser",
+      "//storage/common",
       "//third_party/WebKit/public:resources",
       "//third_party/adobe/flash:flapper_version_h",
       "//third_party/expat",
@@ -107,8 +109,6 @@ static_library("ui") {
       "//ui/surface",
       "//ui/web_dialogs",
       "//v8",
-      "//webkit/browser:storage",
-      "//storage/common",
     ]
     # TODO(GYP)
     #'defines': [

chrome/chrome_browser.gypi

@@ -2928,6 +2928,7 @@
             '../mojo/mojo_base.gyp:mojo_system_impl',
             '../net/net.gyp:net_extras',
             '../net/net.gyp:net_with_v8',
+            '../storage/storage_browser.gyp:storage',
             '../storage/storage_common.gyp:storage_common',
             # TODO(tonyg): Remove this dependency (crbug.com/280157).
             '../testing/perf/perf_test.gyp:*',
@@ -2942,7 +2943,6 @@
             '../ui/surface/surface.gyp:surface',
             '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
             '../v8/tools/gyp/v8.gyp:v8',
-            '../webkit/storage_browser.gyp:storage',
           ],
           'sources': [
             '<@(chrome_browser_non_ios_sources)',

chrome/chrome_browser_chromeos.gypi

@@ -73,6 +73,7 @@
         '../net/net.gyp:net',
         '../ppapi/ppapi_internal.gyp:ppapi_ipc',  # For PpapiMsg_LoadPlugin
         '../skia/skia.gyp:skia',
+        '../storage/storage_browser.gyp:storage',
         '../storage/storage_common.gyp:storage_common',
         '../sync/sync.gyp:sync',
         '../third_party/adobe/flash/flash_player.gyp:flapper_version_h',
@@ -106,7 +107,6 @@
         '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
         '../url/url.gyp:url_lib',
         '../v8/tools/gyp/v8.gyp:v8',
-        '../webkit/storage_browser.gyp:storage',
         'chrome_resources.gyp:chrome_strings',
       ],
       'defines': [

chrome/chrome_browser_extensions.gypi

@@ -936,6 +936,7 @@
         '../extensions/extensions_strings.gyp:extensions_strings',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
+        '../storage/storage_browser.gyp:storage',
         '../storage/storage_common.gyp:storage_common',
         '../sync/sync.gyp:sync',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
@@ -951,7 +952,6 @@
         '../ui/resources/ui_resources.gyp:ui_resources',
         '../ui/strings/ui_strings.gyp:ui_strings',
         '../url/url.gyp:url_lib',
-        '../webkit/storage_browser.gyp:storage',
       ],
       'include_dirs': [
         '..',

chrome/chrome_browser_ui.gypi

@@ -2625,6 +2625,7 @@
             '../media/media.gyp:media',
             '../mojo/mojo_base.gyp:mojo_system_impl',
             '../net/net.gyp:net_with_v8',
+            '../storage/storage_browser.gyp:storage',
             '../storage/storage_common.gyp:storage_common',
             '../third_party/expat/expat.gyp:expat',
             '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
@@ -2635,7 +2636,6 @@
             '../ui/surface/surface.gyp:surface',
             '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
             '../v8/tools/gyp/v8.gyp:v8',
-            '../webkit/storage_browser.gyp:storage',
           ],
           'defines': [
             '<@(nacl_defines)',

content/browser/BUILD.gn

@@ -98,6 +98,7 @@ source_set("browser") {
       "//mojo/public/interfaces/application",
       "//mojo/public/js/bindings",
       "//net:http_server",
+      "//storage/browser",
       "//storage/common",
       "//third_party/WebKit/public:resources",
       "//third_party/angle:commit_id",
@@ -106,7 +107,6 @@ source_set("browser") {
       "//third_party/libyuv",
       "//ui/resources",
       "//ui/surface",
-      "//webkit/browser:storage",
     ]
   }
 

content/common/BUILD.gn

@@ -61,10 +61,10 @@ source_set("common") {
       "//mojo/public/interfaces/application",
       "//mojo/system",
       "//sandbox",
+      "//storage/browser",
+      "//storage/common",
       "//third_party/WebKit/public:blink",
       "//ui/gl",
-      "//webkit/browser:storage",
-      "//storage/common",
       "//webkit/common/gpu",
     ]
   }

content/content_browser.gypi

@@ -1598,11 +1598,11 @@
         '../mojo/mojo_base.gyp:mojo_cpp_bindings',
         '../mojo/mojo_base.gyp:mojo_js_bindings',
         '../net/net.gyp:http_server',
+        '../storage/storage_browser.gyp:storage',
         '../storage/storage_common.gyp:storage_common',
         '../third_party/angle/src/build_angle.gyp:commit_id',
         '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
         '../ui/surface/surface.gyp:surface',
-        '../webkit/storage_browser.gyp:storage',
       ],
     }],
     ['enable_printing!=0', {

content/content_common.gypi

@@ -564,11 +564,11 @@
         '../mojo/mojo_base.gyp:mojo_cpp_bindings',
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
         '../mojo/mojo_base.gyp:mojo_system_impl',
+        '../storage/storage_browser.gyp:storage',
         '../storage/storage_common.gyp:storage_common',
         '../third_party/WebKit/public/blink.gyp:blink',
         '../ui/gl/gl.gyp:gl',
         '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
-        '../webkit/storage_browser.gyp:storage',
       ],
       'actions': [
         {

content/content_shell.gypi

@@ -54,6 +54,7 @@
         '../net/net.gyp:net',
         '../net/net.gyp:net_resources',
         '../skia/skia.gyp:skia',
+        '../storage/storage_browser.gyp:storage',
         '../third_party/WebKit/public/blink.gyp:blink',
         '../third_party/WebKit/public/blink.gyp:blink_test_support',
         '../ui/base/ui_base.gyp:ui_base',
@@ -64,7 +65,6 @@
         '../ui/gl/gl.gyp:gl',
         '../url/url.gyp:url_lib',
         '../v8/tools/gyp/v8.gyp:v8',
-        '../webkit/storage_browser.gyp:storage',
       ],
       'include_dirs': [
         '..',

content/content_tests.gypi

@@ -277,13 +277,13 @@
             '../ppapi/ppapi_internal.gyp:ppapi_proxy',
             '../ppapi/ppapi_internal.gyp:ppapi_shared',
             '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared',
+            '../storage/storage_browser.gyp:storage',
             '../storage/storage_common.gyp:storage_common',
             '../third_party/WebKit/public/blink.gyp:blink',
             '../ui/compositor/compositor.gyp:compositor_test_support',
             '../ui/surface/surface.gyp:surface',
             '../v8/tools/gyp/v8.gyp:v8',
             '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
-            '../webkit/storage_browser.gyp:storage',
           ],
           'export_dependent_settings': [
             '../third_party/WebKit/public/blink.gyp:blink',
@@ -761,14 +761,14 @@
             '../ipc/ipc.gyp:test_support_ipc',
             '../media/media.gyp:media_test_support',
             '../media/media.gyp:shared_memory_support',
+            '../storage/storage_browser.gyp:storage',
             '../storage/storage_common.gyp:storage_common',
             '../third_party/WebKit/public/blink.gyp:blink',
             '../third_party/icu/icu.gyp:icui18n',
             '../third_party/icu/icu.gyp:icuuc',
             '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
             '../third_party/libjingle/libjingle.gyp:libjingle',
             '../ui/gl/gl.gyp:gl',
-            '../webkit/storage_browser.gyp:storage',
           ],
         }],
         ['enable_plugins==0', {

content/shell/BUILD.gn

@@ -227,6 +227,7 @@ static_library("content_shell_lib") {
     "//net",
     "//net:net_resources",
     "//skia",
+    "//storage/browser",
     "//third_party/WebKit/public:blink",
     "//third_party/WebKit/public:resources",
     "//third_party/WebKit/public:test_support",
@@ -239,7 +240,6 @@ static_library("content_shell_lib") {
     "//ui/gl",
     "//url",
     "//v8",
-    "//webkit/browser:storage",
     #'copy_test_netscape_plugin',  TODO(GYP)
   ]
 

content/test/BUILD.gn

@@ -20,6 +20,7 @@ static_library("test_support") {
     "//content/public/common",
     "//net:test_support",
     "//skia",
+    "//storage/common",
     "//testing/gmock",
     "//testing/gtest",
     "//ui/accessibility:ax_gen",
@@ -32,7 +33,6 @@ static_library("test_support") {
     "//ui/gfx:test_support",
     "//ui/resources",
     "//url",
-    "//storage/common",
   ]
 
   if (!is_ios) {
@@ -53,12 +53,12 @@ static_library("test_support") {
       "//ppapi:ppapi_proxy",
       "//ppapi:ppapi_shared",
       "//ppapi:ppapi_unittest_shared",
+      "//storage/browser",
       "//storage/common",
       "//third_party/WebKit/public:blink",
       "//ui/surface",
       "//v8",
       "//webkit/common/gpu",
-      "//webkit/browser:storage",
     ]
 
     forward_dependent_configs_from = [

storage/DEPS

@@ -1,5 +1,7 @@
 include_rules = [
   "+net",
   "+sql",
+  "+third_party/leveldatabase",
+  "+third_party/sqlite",
   "+third_party/WebKit/public/platform",
 ]

webkit/browser/BUILD.gn → storage/browser/BUILD.gn

@@ -2,9 +2,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# GYP version: webkit/storage_browser.gyp:storage
-component("storage") {
-  output_name = "storage"
+# GYP version: storage/storage_browser.gyp:storage
+component("browser") {
+  output_name = "storage_browser"
   sources = [
     "storage_browser_export.h",
     "blob/blob_data_handle.cc",
@@ -185,7 +185,7 @@ executable("dump_file_system") {
   ]
 
   deps = [
-    ":storage",
+    ":browser",
     "//base",
     "//storage/common",
   ]

webkit/browser/blob/blob_data_handle.cc → storage/browser/blob/blob_data_handle.cc

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/browser/blob/blob_data_handle.h"
+#include "storage/browser/blob/blob_data_handle.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/sequenced_task_runner.h"
-#include "webkit/browser/blob/blob_storage_context.h"
-#include "webkit/common/blob/blob_data.h"
+#include "storage/browser/blob/blob_storage_context.h"
+#include "storage/common/blob/blob_data.h"
 
 namespace storage {