Cleanup test_support target names.

media/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/android/config.gni")
 import("//build/config/arm.gni")
 import("//build/config/ui.gni")
 import("//build/config/linux/pkg_config.gni")
 import("//media/media_options.gni")
 
@@ skipping 815 matching lines @@
 #          'conditions': [
 #            ['use_allocator!="none"', {
 #              'dependencies': [
 #                '../base/allocator/allocator.gyp:allocator',
 #              ],
 #            }],
 #          ],
 #        }],
   deps = [
     ":media",
-    ":media_test_support",
+    ":test_support",
     "//base/test:test_support",
     "//media/audio:unittests",
     "//media/audio:test_support",
     "//skia",  # Direct dependency required to inherit config.
     "//testing/gmock",
     "//testing/gtest",
     # TODO(dalecurtis): Port the rest of Widevine stuff.
     "//third_party/widevine/cdm:version_h",
     "//ui/base",
-    "//ui/gfx:gfx_test_support",
+    "//ui/gfx:test_support",
   ]
   if (media_use_ffmpeg) {
     deps += [
       "//third_party/ffmpeg",  # Direct dependency required to inherit config.
     ]
   }
 }
 
 test("media_perftests") {
   sources = [
     "base/audio_bus_perftest.cc",
     "base/audio_converter_perftest.cc",
     "base/run_all_perftests.cc",
     "base/sinc_resampler_perftest.cc",
     "base/vector_math_perftest.cc",
     "base/yuv_convert_perftest.cc",
   ]
   if (media_use_ffmpeg) {
     sources += [
       "base/demuxer_perftest.cc",
       "filters/pipeline_integration_perftest.cc",
       "filters/pipeline_integration_test_base.cc",
     ]
   }
   configs += [ ":media_config" ]
   deps = [
     ":media",
-    ":media_test_support",
     ":shared_memory_support",
+    ":test_support",
     "//base/test:test_support",
     "//media/audio:test_support",
     "//testing/gmock",
     "//testing/gtest",
     "//testing/perf",
     "//third_party/widevine/cdm:version_h",
     "//ui/gl",
-    "//ui/gfx:gfx_test_support",
+    "//ui/gfx:test_support",
   ]
   if (media_use_ffmpeg) {
     deps += [
       "//third_party/ffmpeg",  # Direct dependency required to inherit config.
     ]
   }
 }
 
 if (cpu_arch == "x86" || cpu_arch == "x64") {
   source_set("media_mmx") {
@@ skipping 65 matching lines @@
         yasm_flags += [ "-DELF" ]
         if (cpu_arch == "x64") {
         # TODO(ajwong): Why isn't this true in mac?
           yasm_flags += [ "-DPIC" ]
         }
       }
     }
   }
 }
 
-source_set("media_test_support") {
+source_set("test_support") {
   sources = [
     "base/fake_audio_render_callback.cc",
     "base/fake_audio_render_callback.h",
     "base/fake_audio_renderer_sink.cc",
     "base/fake_audio_renderer_sink.h",
     "base/fake_text_track_stream.cc",
     "base/fake_text_track_stream.h",
     "base/gmock_callback_support.h",
     "base/mock_audio_renderer_sink.cc",
     "base/mock_audio_renderer_sink.h",
@@ skipping 41 matching lines @@
   configs += [ ":media_config" ]
   deps = [ "//base" ]
 }
 
 if (media_use_ffmpeg) {
   test("ffmpeg_unittests") {
     sources = [ "ffmpeg/ffmpeg_unittest.cc" ]
 
     deps = [
        ":media",
-       ":media_test_support",
+       ":test_support",
        "//base",
        "//base:i18n",
        "//base/test:test_support",
        "//testing/gtest",
        "//third_party/ffmpeg",
-       "//ui/gfx:gfx_test_support",
+       "//ui/gfx:test_support",
     ]
   }
 
   test("ffmpeg_regression_tests") {
     sources = [
       "base/run_all_unittests.cc",
       "ffmpeg/ffmpeg_regression_tests.cc",
       "filters/pipeline_integration_test_base.cc",
     ]
     configs += [ ":media_config" ]
     deps = [
       ":media",
-      ":media_test_support",
+      ":test_support",
       "//base/test:test_support",
       "//media/audio:test_support",
       "//testing/gmock",
       "//testing/gtest",
       "//third_party/ffmpeg",
       "//ui/gfx/geometry",
-      "//ui/gfx:gfx_test_support",
+      "//ui/gfx:test_support",
     ]
   # TODO(ajwong): This was in the original gyp, but it seems silly.
   #        ['os_posix==1 and OS!="mac"', {
   #          'conditions': [
   #            ['use_allocator!="none"', {
   #              'dependencies': [
   #                '../base/allocator/allocator.gyp:allocator',
   #              ],
   #            }],
   #          ],
@@ skipping 105 matching lines @@
       "base/android/java/src/org/chromium/media/ImageFormat.template",
     ]
     inputs = [
       "video/capture/android/imageformat_list.h"
     ]
     package_name = "org/chromium/media"
   }
 
   # TODO(dalecurtis): Finish media_unittests_apk and media_perftests_apk.
 }