Cleanup test_support target names.

In GN it is redundat to include the parent directory name, as in ui/gfx:gfx_test_support. Instead we can write it as ui/gfx:test_support which is shorter and nicer to read. Targets found with the following command line: $ for f in $(g ls-files | grep BUILD); do grep _test_support $f; echo $f; done BUG=None TEST=None R=brettw@chromium.org TBR=darin@chromium.org Review URL: https://codereview.chromium.org/409493002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284800 0039d316-1c4b-4281-b951-d872f2087c98
cbchan · Jul 22, 2014 · e54a1f5 · e54a1f5
1 parent 49fef79
commit e54a1f5
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 36 deletions.
diff --git a/cc/BUILD.gn b/cc/BUILD.gn
@@ -614,7 +614,7 @@ source_set("test_support") {
     #"//third_party/mesa/mesa.gyp:osmesa",
     "//ui/gfx",
     "//ui/gfx/geometry",
-    "//ui/gfx:gfx_test_support",
+    "//ui/gfx:test_support",
     "//ui/gl",
   ]
 }

diff --git a/components/wifi/BUILD.gn b/components/wifi/BUILD.gn
@@ -37,7 +37,7 @@ component("wifi") {
   }
 }
 
-source_set("wifi_test_support") {
+source_set("test_support") {
   sources = [
     "fake_wifi_service.cc",
     "fake_wifi_service.h",

diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
@@ -21,12 +21,12 @@ static_library("test_support") {
     "//testing/gtest",
     "//ui/accessibility:ax_gen",
     "//ui/base",
-    "//ui/base:ui_base_test_support",
+    "//ui/base:test_support",
     "//ui/events:dom4_keycode_converter",
     "//ui/events:events_base",
-    "//ui/events:events_test_support",
+    "//ui/events:test_support",
     "//ui/events:gesture_detection",
-    "//ui/gfx:gfx_test_support",
+    "//ui/gfx:test_support",
     "//ui/resources",
     "//url",
     "//webkit/common",

diff --git a/dbus/BUILD.gn b/dbus/BUILD.gn
@@ -46,13 +46,13 @@ component("dbus") {
   ]
 }
 
-proto_library("dbus_test_proto") {
+proto_library("test_proto") {
   sources = [ "test_proto.proto" ]
 }
 
 # This target contains mocks that can be used to write unit tests without
 # issuing actual D-Bus calls.
-source_set("dbus_test_support") {
+source_set("test_support") {
   sources = [
     "mock_bus.cc",
     "mock_bus.h",
@@ -95,8 +95,8 @@ test("dbus_unittests") {
 
   deps = [
     ":dbus",
-    ":dbus_test_proto",
-    ":dbus_test_support",
+    ":test_proto",
+    ":test_support",
     "//base/test:test_support",
     "//testing/gmock",
     "//testing/gtest",

diff --git a/gpu/BUILD.gn b/gpu/BUILD.gn
@@ -104,7 +104,7 @@ test("gl_tests") {
     "//testing/gtest",
     "//third_party/angle:translator",
     "//ui/gfx",
-    "//ui/gfx:gfx_test_support",
+    "//ui/gfx:test_support",
     "//ui/gfx/geometry",
     "//ui/gl",
     #"//gpu/command_buffer/client",  # These are all part of //gpu, needed?
@@ -231,7 +231,7 @@ test("gpu_unittests") {
     "//testing/gtest",
     "//third_party/angle:translator",
     "//ui/gfx",
-    "//ui/gfx:gfx_test_support",
+    "//ui/gfx:test_support",
     "//ui/gfx/geometry",
     "//ui/gl",
     "//gpu/command_buffer/client:gles2_c_lib",

diff --git a/media/BUILD.gn b/media/BUILD.gn
@@ -833,7 +833,7 @@ test("media_unittests") {
 #        }],
   deps = [
     ":media",
-    ":media_test_support",
+    ":test_support",
     "//base/test:test_support",
     "//media/audio:unittests",
     "//media/audio:test_support",
@@ -843,7 +843,7 @@ test("media_unittests") {
     # 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 += [
@@ -871,16 +871,16 @@ test("media_perftests") {
   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 += [
@@ -966,7 +966,7 @@ if (cpu_arch == "x86" || cpu_arch == "x64") {
   }
 }
 
-source_set("media_test_support") {
+source_set("test_support") {
   sources = [
     "base/fake_audio_render_callback.cc",
     "base/fake_audio_render_callback.h",
@@ -1028,13 +1028,13 @@ if (media_use_ffmpeg) {
 
     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",
     ]
   }
 
@@ -1047,14 +1047,14 @@ if (media_use_ffmpeg) {
     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"', {

diff --git a/printing/BUILD.gn b/printing/BUILD.gn
@@ -216,7 +216,7 @@ test("printing_unittests") {
     "//testing/gtest",
     "//ui/base",
     "//ui/gfx",
-    "//ui/gfx:gfx_test_support",
+    "//ui/gfx:test_support",
     "//ui/gfx/geometry",
   ]
 }

diff --git a/ui/accessibility/BUILD.gn b/ui/accessibility/BUILD.gn
@@ -37,7 +37,7 @@ component("accessibility") {
   ]
 }
 
-source_set("accessibility_test_support") {
+source_set("test_support") {
   sources = [
     "tree_generator.cc",
     "tree_generator.h"
@@ -57,7 +57,7 @@ test("accessibility_unittests") {
 
   deps = [
     ":accessibility",
-    ":accessibility_test_support",
+    ":test_support",
     "//base",
     "//base/test:run_all_unittests",
     "//testing/gtest",

diff --git a/ui/aura/BUILD.gn b/ui/aura/BUILD.gn
@@ -176,11 +176,11 @@ source_set("test_support") {
     "//skia",
     "//testing/gtest",
     "//ui/base",
-    "//ui/base:ui_base_test_support",
+    "//ui/base:test_support",
     "//ui/compositor:test_support",
     "//ui/events",
     "//ui/events:events_base",
-    "//ui/events:events_test_support",
+    "//ui/events:test_support",
     "//ui/gfx",
     "//ui/gfx/geometry",
   ]
@@ -214,7 +214,7 @@ source_set("test_support") {
 #
 #  deps = [
 #    ":aura",
-#    ":aura_test_support",
+#    ":test_support",
 #    "//base",
 #    "//base:i18n",
 #    "//skia",
@@ -242,7 +242,7 @@ source_set("test_support") {
 #
 #  deps = [
 #    ":aura",
-#    ":aura_test_support",
+#    ":test_support",
 #    "//base",
 #    "//base:i18n",
 #    "//cc",
@@ -275,12 +275,12 @@ source_set("test_support") {
 #
 #  deps = [
 #    ":aura",
-#    ":aura_test_support",
-#   "//base/test:test_support",
+#    ":test_support",
+#    "//base/test:test_support",
 #    "//skia",
 #    "//testing/gtest",
 #    "//ui/base",
-#    "//ui/base:ui_base_test_support",
+#    "//ui/base:test_support",
 #    "//ui/compositor",
 #    "//ui/compositor:test_support",
 #    "//ui/events",

diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
@@ -600,7 +600,7 @@ component("base") {
   }
 }
 
-source_set("ui_base_test_support") {
+source_set("test_support") {
   sources = [
     "test/ui_controls.h",
     "test/ui_controls_aura.cc",

diff --git a/ui/events/BUILD.gn b/ui/events/BUILD.gn
@@ -225,7 +225,7 @@ component("gesture_detection") {
   }
 }
 
-source_set("events_test_support") {
+source_set("test_support") {
   sources = [
     "test/cocoa_test_event_utils.h",
     "test/cocoa_test_event_utils.mm",
@@ -303,12 +303,12 @@ test("events_unittests") {
   deps = [
     ":events",
     ":events_base",
-    ":events_test_support",
     ":gesture_detection",
+    ":test_support",
     "//base",
     "//base/test:run_all_unittests",
     "//skia",
     "//testing/gtest",
-    "//ui/gfx:gfx_test_support",
+    "//ui/gfx:test_support",
   ]
 }
diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn
@@ -363,7 +363,7 @@ component("gfx") {
 
 # Looking for gfx_geometry? It's //ui/gfx/geometry:geometry
 
-source_set("gfx_test_support") {
+source_set("test_support") {
   sources = [
     "test/fontconfig_util_linux.cc",
     "test/fontconfig_util_linux.h",
@@ -412,7 +412,7 @@ test("gfx_unittests") {
 
   deps = [
     ":gfx",
-    ":gfx_test_support",
+    ":test_support",
     "//base",
     "//base/test:test_support",
     "//testing/gtest",