Split storage macros into storage and storage_common

content/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.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//content/browser/browser.gni")
 
 config("storage_config") {
   if (is_android) {
@@ skipping 89 matching lines @@
       "//net:http_server",
       "//third_party/WebKit/public:resources",
       "//third_party/angle:commit_id",
       "//third_party/icu",
       "//third_party/leveldatabase",
       "//third_party/libyuv",
       "//ui/resources",
       "//ui/surface",
       "//webkit/browser:storage",
       "//webkit/common",
-      "//webkit/common:storage",
+      "//webkit/common:storage_common",
     ]
   }
 
   configs += [
     "//content:content_implementation",
     "//content:libjingle_stub_config",  # TODO(GYP) remove when libjingle is ready.
     "//content:webrtc_stub_config",  # TODO(GYP) remove when webrtc is ready.
   ]
 
   if (toolkit_views) {
@@ skipping 287 matching lines @@
       deps += [ "//dbus" ]
     } else {
       # This will already have gotten removed for all non-Linux cases.
        sources -= [
          "battery_status/battery_status_manager_linux.cc",
          "geolocation/wifi_data_provider_linux.cc",
        ]
     }
   }
 }