Fix media_mojo builds

media/mojo/services/BUILD.gn

Index: media/mojo/services/BUILD.gn
diff --git a/media/mojo/services/BUILD.gn b/media/mojo/services/BUILD.gn
index 71b68dddea58a4cd6aa2f4d0379cf92e26b3475c..d5a2d74705706133635ddb272047d5c47809fd23 100644
--- a/media/mojo/services/BUILD.gn
+++ b/media/mojo/services/BUILD.gn
@@ -11,16 +11,6 @@ import("//testing/test.gni")
 
 component("services") {
   output_name = "media_mojo_services"
-
-  public_deps = [
-    ":lib",
-  ]
-}
-
-# TODO(xhwang): Add this intermediate target because ServiceTest doesn't support
-# services that depend on shared libraries in component build.
-# See http://crbug.com/670094
-source_set("lib") {
   sources = [
     "gpu_mojo_media_client.cc",
     "gpu_mojo_media_client.h",
@@ -106,11 +96,6 @@ source_set("lib") {
 service("media") {
   testonly = true
 
-  # crbug.com/676418: Suppress symbol import warnings.
-  if (is_win && is_component_build) {
-    ldflags = [ "/ignore:4217" ]
-  }
-
   sources = [
     "main.cc",
   ]
@@ -121,44 +106,39 @@ service("media") {
   ]
 
   deps = [
-    ":lib",
+    ":services",
     "//mojo/public/c/system",
     "//services/service_manager/public/cpp",
   ]
 }
 
-# crbug.com/676055: media_service_unittests currently fails to link in Windows
-# component builds, so don't declare it, otherwise the "all" target will still
-# try to build it.
-if (!(is_win && is_component_build)) {
-  service_test("media_service_unittests") {
-    testonly = true
+service_test("media_service_unittests") {
+  testonly = true
 
-    sources = [
-      "media_service_unittest.cc",
-    ]
+  sources = [
+    "media_service_unittest.cc",
+  ]
 
-    catalog = ":media_service_unittests_catalog"
-
-    deps = [
-      ":lib",
-      "//base",
-      "//media",
-      "//media/base:test_support",
-      "//media/mojo/clients",
-      "//media/mojo/common",
-      "//media/mojo/interfaces",
-      "//media/mojo/interfaces:constants",
-      "//services/service_manager/public/cpp:service_test_support",
-      "//testing/gmock",
-      "//testing/gtest",
-    ]
+  catalog = ":media_service_unittests_catalog"
 
-    data_deps = [
-      ":media",
-    ]
-  }
-}  # !(is_win && is_component_build)
+  deps = [
+    ":services",
+    "//base",
+    "//media",
+    "//media/base:test_support",
+    "//media/mojo/clients",
+    "//media/mojo/common",
+    "//media/mojo/interfaces",
+    "//media/mojo/interfaces:constants",
+    "//services/service_manager/public/cpp:service_test_support",
+    "//testing/gmock",
+    "//testing/gtest",
+  ]
+
+  data_deps = [
+    ":media",
+  ]
+}
 
 service_manifest("media_manifest") {
   name = "media"