Remove webkit_support_in_chromium.gyp and use webkit_support.gyp

webkit/tools/test_shell/test_shell.gypi

 # Copyright (c) 2010 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': {
     'test_shell_windows_resource_files': [
       'resources/test_shell.rc',
       'resources/pan_east.cur',
       'resources/pan_middle.cur',
@@ skipping 19 matching lines @@
       'dependencies': [
         '<(DEPTH)/app/app.gyp:app_base',
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:base_i18n',
         '<(DEPTH)/media/media.gyp:media',
         '<(DEPTH)/net/net.gyp:net',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/testing/gmock.gyp:gmock',
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(DEPTH)/third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
-        '<(DEPTH)/webkit/support/webkit_support_in_chromium.gyp:appcache',
-        '<(DEPTH)/webkit/support/webkit_support_in_chromium.gyp:database',
-        '<(DEPTH)/webkit/support/webkit_support_in_chromium.gyp:glue',
-        '<(DEPTH)/webkit/support/webkit_support_in_chromium.gyp:webkit_resources',
-        '<(DEPTH)/webkit/support/webkit_support_in_chromium.gyp:webkit_support',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:appcache',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:database',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support',
         '<(DEPTH)/webkit/webkit.gyp:inspector_resources',
         'npapi_layout_test_plugin',
       ],
       'msvs_guid': '77C32787-1B96-CB84-B905-7F170629F0AC',
       'sources': [
         'mac/test_shell_webview.h',
         'mac/test_shell_webview.mm',
         'mac/test_webview_delegate.mm',
         'mac/webview_host.mm',
         'mac/webwidget_host.mm',
@@ skipping 53 matching lines @@
         'webview_host_gtk.cc',
         'webview_host_win.cc',
         'webwidget_host.h',
         'webwidget_host_gtk.cc',
         'webwidget_host_win.cc',
       ],
       'export_dependent_settings': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/net/net.gyp:net',
         '<(DEPTH)/third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
-        '<(DEPTH)/webkit/support/webkit_support_in_chromium.gyp:glue',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
       ],
       'conditions': [
         # http://code.google.com/p/chromium/issues/detail?id=18337
         ['target_arch!="x64" and target_arch!="arm"', {
           'dependencies': [
             'npapi_test_plugin',
           ],
         }],
         ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
           'dependencies': [
@@ skipping 211 matching lines @@
             {
               'destination': '<(PRODUCT_DIR)/TestShell.app/Contents/MacOS/',
               'files': [
                 '<(PRODUCT_DIR)/libffmpegsumo.dylib',
               ],
             },
           ],
         }, { # OS != "mac"
           'dependencies': [
             '<(DEPTH)/net/net.gyp:net_resources',
-            '<(DEPTH)/webkit/support/webkit_support_in_chromium.gyp:webkit_resources',
-            '<(DEPTH)/webkit/support/webkit_support_in_chromium.gyp:webkit_strings',
+            '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
+            '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
           ]
         }],
       ],
     },
     {
       'target_name': 'test_shell_tests',
       'type': 'executable',
       'variables': {
         'chromium_code': 1,
       },
@@ skipping 425 matching lines @@
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: