Rename storage-related export macros and build targets

chrome/chrome_browser.gypi

 # Copyright 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.
 
 {
   'variables': {
     # All .cc, .h, .m, and .mm files under browser except for:
     # * tests and mocks.
     # * code below browser/chromeos
     # * code below browser/extensions
@@ skipping 2940 matching lines @@
             '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',
             '../third_party/libyuv/libyuv.gyp:libyuv',
             '../third_party/npapi/npapi.gyp:npapi',
             '../third_party/smhasher/smhasher.gyp:cityhash',
             '../third_party/webrtc/modules/modules.gyp:desktop_capture',
             '../ui/gl/gl.gyp:gl',
             '../ui/surface/surface.gyp:surface',
             '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
             '../v8/tools/gyp/v8.gyp:v8',
-            '../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',
           ],
           'sources': [
             '<@(chrome_browser_non_ios_sources)',
 
             # These files are generated by GRIT.
             '<(grit_out_dir)/grit/component_extension_resources_map.cc',
             '<(grit_out_dir)/grit/theme_resources_map.cc',
             '<(SHARED_INTERMEDIATE_DIR)/ui/resources/grit/ui_resources_map.cc',
 
             # This file is generated by
@@ skipping 609 matching lines @@
           'variables': {
             'proto_in_dir': 'browser/sync_file_system/drive_backend',
             'proto_out_dir': 'chrome/browser/sync_file_system/drive_backend',
           },
           'includes': [ '../build/protoc.gypi' ]
         },
       ],
     },],
   ],
 }