media: Fix media_mojo_shell_unittests

media/mojo/services/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("//media/media_options.gni")
 import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 import("//testing/test.gni")
 
 config("mojo_media_config") {
@@ skipping 31 matching lines @@
 
     if (enable_test_mojo_media_client) {
       defines += [ "ENABLE_TEST_MOJO_MEDIA_CLIENT" ]
     }
   }
 }
 
 component("services") {
   output_name = "media_mojo_services"
 
+  public_deps = [
+    ":media_service",
+  ]
+}
+
+# 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("media_service") {

[alokp, 2016/12/01 18:36:11]

nit: would it make sense to make "services" target a source_set so that we do
not have to create this target? Also, the target name is confusing to me - too
many media services. If you decide to keep this target, may be rename it to
"lib"?

[xhwang, 2016/12/01 22:02:13]

We did use source_set before that there was a bug in that case:

https://chromium.googlesource.com/chromium/src/+/d3b5d3f46840aba12d0788a14f14...
https://bugs.chromium.org/p/chromium/issues/detail?id=610904
Done.

I hope http://crbug.com/670094 will be fixed soon then we don't need this hack.

   sources = [
     "demuxer_stream_provider_shim.cc",
     "demuxer_stream_provider_shim.h",
     "interface_factory_impl.cc",
     "interface_factory_impl.h",
     "media_mojo_export.h",
     "media_service.cc",
     "media_service.h",
     "media_service_factory.cc",
     "media_service_factory.h",
@@ skipping 57 matching lines @@
 }
 
 service("media") {
   testonly = true
 
   sources = [
     "main.cc",
   ]
 
   public_deps = [
-    ":services",
     "//base",
     "//media",
   ]
 
   deps = [
+    ":media_service",
     "//mojo/public/c/system",
     "//services/service_manager/public/cpp",
   ]
+
+  data_deps = [
+    ":media_manifest",
+  ]
 }
 
 test("media_mojo_shell_unittests") {
   testonly = true
 
   sources = [
     "media_mojo_unittest.cc",
   ]
 
   deps = [
     "//media",
     "//media/base:test_support",
     "//media/mojo/clients",
     "//media/mojo/common",
     "//media/mojo/interfaces",
     "//services/service_manager/public/cpp:service_test_support",
     "//services/service_manager/public/cpp/test:run_all_service_tests",
     "//testing/gmock",
     "//testing/gtest",
   ]
 
   data_deps = [
-    "//media/mojo/services:test_manifest",
-    "//media/mojo/services:media",
+    ":media",
+    ":test_manifest",
   ]
 }
 
 service_manifest("media_manifest") {
   name = "media"
   source = "media_manifest.json"
 }
 
 service_manifest("test_manifest") {
   name = "media_mojo_shell_unittests"
@@ skipping 11 matching lines @@
   data_deps = [
     ":media",
     ":pipeline_test_manifest",
   ]
 }
 
 service_manifest("pipeline_test_manifest") {
   name = "media_pipeline_integration_unittests"
   source = "pipeline_test_manifest.json"
 }