Rename storage-related export macros and build targets

content/content_browser.gypi

 # Copyright (c) 2012 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.
 
 {
   'dependencies': [
     '../base/base.gyp:base_static',
     '../crypto/crypto.gyp:crypto',
     '../google_apis/google_apis.gyp:google_apis',
     '../net/net.gyp:net',
@@ skipping 1583 matching lines @@
         '../cc/cc.gyp:cc',
         '../cc/cc.gyp:cc_surfaces',
         '../mojo/mojo_base.gyp:mojo_application_bindings',
         '../mojo/mojo_base.gyp:mojo_cpp_bindings',
         '../mojo/mojo_base.gyp:mojo_js_bindings',
         '../net/net.gyp:http_server',
         '../third_party/angle/src/build_angle.gyp:commit_id',
         '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
         '../ui/surface/surface.gyp:surface',
         '../webkit/common/webkit_common.gyp:webkit_common',
-        '../webkit/storage_browser.gyp:webkit_storage_browser',
-        '../webkit/storage_common.gyp:webkit_storage_common',
+        '../webkit/storage_browser.gyp:storage',
+        '../webkit/storage_common.gyp:storage_common',
       ],
     }],
     ['enable_printing!=0', {
       'dependencies': [
         '../printing/printing.gyp:printing',
       ],
     }],
     ['OS!="ios" and chrome_multiple_dll!=1', {
       'dependencies': [
         '../third_party/WebKit/public/blink.gyp:blink',
@@ skipping 253 matching lines @@
       'sources': [
         'browser/media/cdm/browser_cdm_manager.cc',
         'browser/media/cdm/browser_cdm_manager.h',
         # This works on Android because enable_browser_cdms==1 on Android.
         'browser/media/media_web_contents_observer.cc',
         'browser/media/media_web_contents_observer.h',
       ],
     }],
   ],
 }