Convert some GN test support targets to static libs.

Converts some source sets that were source sets into static libraries. Converts additional targets in the touched files to static libraries where it seemed relevant.

A few redundant dependencies were removed (one shouldn't need to specify both "foo" and "foo:test_support"). A few empty source sets were converted to groups.

BUG=627637
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel

Review-Url: https://codereview.chromium.org/2151013002
Cr-Commit-Position: refs/heads/master@{#405593}

extensions/BUILD.gn

@@ -69,7 +69,7 @@ grit("extensions_renderer_resources") {
   ]
 }
 
-source_set("test_support") {
+static_library("test_support") {
   testonly = true
   sources = rebase_path(extensions_gypi_values.extensions_test_support_sources,
                         ".",

google_apis/BUILD.gn

@@ -182,7 +182,7 @@ google_apis_tmpl("google_apis") {
   ]
 }
 
-source_set("test_support") {
+static_library("test_support") {
   testonly = true
   sources = [
     "gaia/fake_gaia.cc",
@@ -202,7 +202,6 @@ source_set("test_support") {
     ":google_apis",
     "//base",
     "//base/test:test_support",
-    "//net",
     "//net:test_support",
   ]
 

google_apis/gcm/BUILD.gn

@@ -85,7 +85,7 @@ proto_library("proto") {
   defines = [ "GCM_IMPLEMENTATION" ]
 }
 
-source_set("test_support") {
+static_library("test_support") {
   testonly = true
   sources = [
     "base/fake_encryptor.cc",

gpu/BUILD.gn

@@ -127,7 +127,7 @@ test("command_buffer_gles2_tests") {
   }
 }
 
-source_set("test_support") {
+static_library("test_support") {
   testonly = true
   sources = [
     "command_buffer/client/gles2_interface_stub.cc",

ipc/BUILD.gn

@@ -282,7 +282,7 @@ if (!is_ios) {
     ]
   }
 
-  source_set("test_support") {
+  static_library("test_support") {
     testonly = true
     sources = [
       "ipc_multiprocess_test.cc",

media/BUILD.gn

@@ -483,7 +483,7 @@ component("media") {
   ]
 }
 
-source_set("cdm_paths") {
+static_library("cdm_paths") {
   sources = [
     "cdm/cdm_paths.cc",
     "cdm/cdm_paths.h",
@@ -755,7 +755,7 @@ test("audio_unittests") {
   ]
 }
 
-source_set("test_support") {
+static_library("test_support") {
   testonly = true
   sources = [
     "renderers/mock_gpu_memory_buffer_video_frame_pool.cc",

media/audio/BUILD.gn

@@ -274,7 +274,7 @@ if (use_pulseaudio && link_pulseaudio) {
   }
 }
 
-source_set("test_support") {
+static_library("test_support") {
   testonly = true
   sources = [
     "audio_unittest_util.cc",

media/base/BUILD.gn

@@ -363,7 +363,7 @@ if (is_ios) {
   }
 }
 
-source_set("test_support") {
+static_library("test_support") {
   testonly = true
   sources = [
     "fake_audio_render_callback.cc",

mojo/edk/test/BUILD.gn

@@ -4,7 +4,7 @@
 
 import("//testing/test.gni")
 
-source_set("test_support") {
+static_library("test_support") {
   testonly = true
   sources = [
     "mojo_test_base.cc",
@@ -73,7 +73,7 @@ source_set("run_all_perftests") {
   }
 }
 
-source_set("test_support_impl") {
+static_library("test_support_impl") {
   testonly = true
   deps = [
     "//base",

mojo/public/cpp/test_support/BUILD.gn

@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 # GYP version: mojo/public/mojo_public.gyp:mojo_public_test_utils
-source_set("test_utils") {
+static_library("test_utils") {
   testonly = true
 
   sources = [

net/BUILD.gn

@@ -506,7 +506,7 @@ bundle_data("test_support_bundle_data") {
   ]
 }
 
-source_set("test_support") {
+static_library("test_support") {
   testonly = true
   sources = [
     "base/load_timing_info_test_util.cc",
@@ -1749,7 +1749,7 @@ if (!is_ios) {
 
 # Fuzzers
 
-source_set("net_fuzzer_test_support") {
+static_library("net_fuzzer_test_support") {
   testonly = true
 
   sources = [

ppapi/proxy/BUILD.gn

@@ -358,7 +358,7 @@ source_set("ipc_sources") {
   }
 }
 
-source_set("test_support") {
+static_library("test_support") {
   testonly = true
 
   sources = [

ppapi/shared_impl/BUILD.gn

@@ -199,7 +199,7 @@ component("shared_impl") {
   }
 }
 
-source_set("test_support") {
+static_library("test_support") {
   testonly = true
 
   sources = [

remoting/BUILD.gn

@@ -113,7 +113,7 @@ if (is_win) {
 }
 
 # GYP version: remoting/remoting_test.gypi:remoting_test_support
-source_set("test_support") {
+group("test_support") {
   testonly = true
 
   deps = [

remoting/client/BUILD.gn

@@ -4,7 +4,7 @@
 
 import("//remoting/remoting_srcs.gni")
 
-source_set("client") {
+static_library("client") {
   # Disabled the source filters because there are _mac files that need to
   # be compiled on all platforms.
   set_sources_assignment_filter([])
@@ -62,7 +62,7 @@ if (is_android || is_ios) {
   }
 }
 
-source_set("test_support") {
+static_library("test_support") {
   testonly = true
 
   sources = [

remoting/host/BUILD.gn

@@ -234,7 +234,7 @@ static_library("host") {
   }
 }
 
-source_set("test_support") {
+static_library("test_support") {
   testonly = true
 
   sources = [
@@ -864,7 +864,7 @@ if (enable_remoting_host && !is_android) {
 }
 
 if (enable_me2me_host) {
-  source_set("remoting_me2me_host_static") {
+  static_library("remoting_me2me_host_static") {
     sources = [
       "pam_authorization_factory_posix.cc",
       "pam_authorization_factory_posix.h",

remoting/protocol/BUILD.gn

@@ -5,7 +5,7 @@
 import("//build/config/features.gni")
 import("//remoting/remoting_srcs.gni")
 
-source_set("protocol") {
+static_library("protocol") {
   sources = rebase_path(remoting_srcs_gypi_values.remoting_protocol_sources,
                         ".",
                         "//remoting")
@@ -50,7 +50,7 @@ source_set("protocol") {
   }
 }
 
-source_set("test_support") {
+static_library("test_support") {
   testonly = true
 
   sources = [

remoting/signaling/BUILD.gn

@@ -4,7 +4,7 @@
 
 import("//remoting/remoting_srcs.gni")
 
-source_set("signaling") {
+static_library("signaling") {
   sources = rebase_path(remoting_srcs_gypi_values.remoting_signaling_sources,
                         ".",
                         "//remoting")
@@ -36,7 +36,7 @@ source_set("signaling") {
   }
 }
 
-source_set("test_support") {
+static_library("test_support") {
   testonly = true
 
   sources = [

remoting/test/BUILD.gn

@@ -4,7 +4,7 @@
 
 import("//remoting/remoting_enable.gni")
 
-source_set("test_support") {
+static_library("test_support") {
   testonly = true
 
   sources = [
@@ -106,7 +106,7 @@ executable("chromoting_test_driver") {
   ]
 }
 
-source_set("ar_test_driver_common") {
+static_library("ar_test_driver_common") {
   testonly = true
 
   sources = [

services/shell/background/tests/BUILD.gn

@@ -6,7 +6,7 @@ import("//mojo/public/mojo_application.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//testing/test.gni")
 
-source_set("test_support") {
+static_library("test_support") {
   sources = [
     "test_catalog_store.cc",
     "test_catalog_store.h",

services/shell/public/cpp/BUILD.gn

@@ -3,14 +3,14 @@
 # found in the LICENSE file.
 
 # GYP version: mojo/mojo_base.gyp:mojo_application_base
-source_set("cpp") {
+group("cpp") {
   public_deps = [
     ":sources",
   ]
 }
 
 # TODO(rockot): Rename this to "cpp".
-source_set("sources") {
+static_library("sources") {
   sources = [
     "application_runner.h",
     "capabilities.h",
@@ -55,7 +55,7 @@ source_set("sources") {
 }
 
 if (!is_ios) {
-  source_set("application_support") {
+  static_library("application_support") {
     sources = [
       "lib/init_commandline.cc",
       "lib/initialize_base_and_icu.cc",
@@ -68,7 +68,7 @@ if (!is_ios) {
     ]
   }
 
-  source_set("service_test_support") {
+  static_library("service_test_support") {
     testonly = true
     sources = [
       "lib/service_test.cc",

services/ui/public/cpp/tests/BUILD.gn

@@ -5,7 +5,7 @@
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 
-source_set("unittest_support") {
+static_library("unittest_support") {
   testonly = true
 
   sources = [
@@ -27,7 +27,7 @@ source_set("unittest_support") {
   ]
 }
 
-source_set("test_support") {
+static_library("test_support") {
   testonly = true
 
   sources = [

services/ui/ws/BUILD.gn

@@ -7,7 +7,7 @@ import("//testing/test.gni")
 import("//mojo/public/mojo_application.gni")
 import("//mojo/public/mojo_application_manifest.gni")
 
-source_set("lib") {
+static_library("lib") {
   sources = [
     "accelerator.cc",
     "accelerator.h",
@@ -136,7 +136,7 @@ source_set("lib") {
   }
 }
 
-source_set("test_interface") {
+static_library("test_interface") {
   sources = [
     "window_server_test_impl.cc",
     "window_server_test_impl.h",
@@ -150,7 +150,7 @@ source_set("test_interface") {
   ]
 }
 
-source_set("test_support") {
+static_library("test_support") {
   testonly = true
 
   sources = [

sql/BUILD.gn

@@ -37,7 +37,7 @@ component("sql") {
   ]
 }
 
-source_set("test_support") {
+static_library("test_support") {
   testonly = true
   sources = [
     "test/error_callback_support.cc",

third_party/WebKit/Source/platform/BUILD.gn

@@ -472,7 +472,7 @@ component("platform") {
   }
 }
 
-source_set("test_support") {
+static_library("test_support") {
   sources = platform_test_support_files
   visibility += [ "//third_party/WebKit/*" ]
   testonly = true

third_party/WebKit/Source/web/BUILD.gn

@@ -66,7 +66,7 @@ component("web") {
 }
 
 # GYP version: WebKit/Source/web/web.gyp:blink_web_test_support
-source_set("test_support") {
+static_library("test_support") {
   deps = [
     "//skia",
     "//third_party/WebKit/Source/core:testing",

ui/accessibility/BUILD.gn

@@ -123,7 +123,7 @@ if (is_android) {
   }
 }
 
-source_set("test_support") {
+static_library("test_support") {
   sources = [
     "platform/test_ax_node_wrapper.cc",
     "platform/test_ax_node_wrapper.h",

ui/app_list/presenter/BUILD.gn

@@ -46,7 +46,7 @@ mojom("mojom") {
   ]
 }
 
-source_set("test_support") {
+static_library("test_support") {
   sources = [
     "test/app_list_presenter_impl_test_api.cc",
     "test/app_list_presenter_impl_test_api.h",

ui/aura/BUILD.gn

@@ -150,7 +150,7 @@ component("aura") {
   }
 }
 
-source_set("test_support") {
+static_library("test_support") {
   testonly = true
   sources = [
     "test/aura_test_base.cc",

ui/base/BUILD.gn

@@ -611,7 +611,7 @@ component("base") {
   }
 }
 
-source_set("test_support") {
+static_library("test_support") {
   testonly = true
   sources = [
     "test/material_design_controller_test_api.cc",

ui/compositor/BUILD.gn

@@ -96,7 +96,7 @@ component("compositor") {
   }
 }
 
-source_set("test_support") {
+static_library("test_support") {
   testonly = true
   sources = [
     "test/context_factories_for_test.cc",

ui/display/BUILD.gn

@@ -140,7 +140,7 @@ if (is_chromeos) {
   }
 }
 
-source_set("test_support") {
+static_library("test_support") {
   testonly = true
   sources = [
     "chromeos/test/action_logger.cc",

ui/events/BUILD.gn

@@ -267,7 +267,7 @@ component("gesture_detection") {
   }
 }
 
-source_set("test_support") {
+static_library("test_support") {
   sources = [
     "test/cocoa_test_event_utils.h",
     "test/cocoa_test_event_utils.mm",

ui/gfx/BUILD.gn

@@ -537,7 +537,7 @@ source_set("memory_buffer_sources") {
   ]
 }
 
-source_set("test_support") {
+static_library("test_support") {
   testonly = true
   sources = [
     "image/image_unittest_util.cc",

ui/gl/BUILD.gn

@@ -290,7 +290,7 @@ component("gl") {
   }
 }
 
-source_set("gl_unittest_utils") {
+static_library("gl_unittest_utils") {
   testonly = true
   sources = [
     "gl_bindings_autogen_mock.cc",
@@ -311,7 +311,7 @@ source_set("gl_unittest_utils") {
   ]
 }
 
-source_set("test_support") {
+static_library("test_support") {
   testonly = true
   sources = [
     "test/gl_image_test_support.cc",

ui/message_center/BUILD.gn

@@ -166,7 +166,7 @@ component("message_center") {
   }
 }
 
-source_set("test_support") {
+static_library("test_support") {
   testonly = true
 
   if (enable_notifications && !is_android) {

ui/views/BUILD.gn

@@ -148,7 +148,7 @@ component("views") {
   }
 }
 
-source_set("test_support_internal") {
+static_library("test_support_internal") {
   testonly = true
   sources = gypi_values.views_test_support_sources
 

ui/views/controls/webview/BUILD.gn

@@ -44,7 +44,7 @@ component("webview") {
   }
 }
 
-source_set("test_support") {
+static_library("test_support") {
   testonly = true
   sources = [
     "../../test/webview_test_helper.cc",

ui/views/mus/BUILD.gn

@@ -118,7 +118,7 @@ group("for_mojo_application") {
   ]
 }
 
-source_set("test_support") {
+static_library("test_support") {
   testonly = true
 
   sources = [