Split storage macros into storage and storage_common

webkit/browser/BUILD.gn

 # Copyright 2014 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.
 
 component("storage") {
   output_name = "storage"
   sources = [
-    "storage_export.h",
+    "../common/storage_export.h",

[jamesr, 2014/08/29 20:46:10]

this should be using its own export header

     "blob/blob_data_handle.cc",
     "blob/blob_data_handle.h",
     "blob/blob_storage_context.cc",
     "blob/blob_storage_context.h",
     "blob/blob_url_request_job.cc",
     "blob/blob_url_request_job.h",
     "blob/blob_url_request_job_factory.cc",
     "blob/blob_url_request_job_factory.h",
     "blob/file_stream_reader.cc",
     "blob/file_stream_reader.h",
@@ skipping 126 matching lines @@
     "quota/special_storage_policy.cc",
     "quota/special_storage_policy.h",
     "quota/storage_monitor.cc",
     "quota/storage_monitor.h",
     "quota/storage_observer.cc",
     "quota/storage_observer.h",
     "quota/usage_tracker.cc",
     "quota/usage_tracker.h",
   ]
 
-  defines = [ "WEBKIT_STORAGE_BROWSER_IMPLEMENTATION" ]
+  defines = [ "STORAGE_IMPLEMENTATION" ]

[jamesr, 2014/08/29 20:46:10]

this should be something like STORAGE_BROWSER_IMPLEMENTATION

   configs += [ "//build/config/compiler:wexit_time_destructors" ]
   if (is_win) {
     cflags = [ "/wd4267" ]  # TODO(jschuh): fix size_t to int truncations.
   }
 
   deps = [
     "//base",
     "//base:i18n",
     "//base/third_party/dynamic_annotations",
     "//net",
     "//sql",
     "//third_party/leveldatabase",
     "//third_party/sqlite",
     "//url",
     "//webkit/common",
-    "//webkit/common:storage",
+    "//webkit/common:storage_common",
   ]
 
   # TODO(GYP) support chrome_multiple_dll
   #['chrome_multiple_dll!=1', {
   #  'dependencies': [
   #    '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
   #  ],
   #}],
 }
 
 executable("dump_file_system") {
   sources = [
     "fileapi/dump_file_system.cc",
   ]
 
   deps = [
     ":storage",
     "//base",
-    "//webkit/common:storage",
+    "//webkit/common:storage_common",
   ]
 }