[Chromecast] Hook up mojo media pipeline.

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 d7581c005bc9763a5d59023dd811033e846b97d9..670f18d5480e3bbd477c21630f8907d5cf4dde02 100644
--- a/media/mojo/services/BUILD.gn
+++ b/media/mojo/services/BUILD.gn
@@ -80,26 +80,6 @@ source_set("proxy") {
   ]
 }
 
-source_set("media_client") {
-  sources = [
-    "mojo_media_client.cc",
-    "mojo_media_client.h",
-  ]
-  if (is_android) {
-    sources += [ "android_mojo_media_client.cc" ]
-  } else {
-    sources += [ "default_mojo_media_client.cc" ]
-  }
-
-  public_configs = [ ":enable_mojo_media_config" ]
-
-  deps = [
-    "//base",
-    "//media",
-    "//media:shared_memory_support",
-  ]
-}
-
 source_set("cdm_service") {
   deps = [
     ":converters",
@@ -131,6 +111,12 @@ source_set("cdm_service") {
     ]
   }
 
+  # TODO(xhwang): Needed because targets can depend on cdm_service directly,
+  # which is a bit hacky since we need to access CdmService directly
+  # from C++ code (AVDA). In the future we'll make those decoders part of
+  # MojoMediaApplication, then we won't need this.
+  public_configs = [ ":enable_mojo_media_config" ]
+
   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 }
 
@@ -158,6 +144,8 @@ source_set("application") {
   sources = [
     "mojo_media_application.cc",
     "mojo_media_application.h",
+    "mojo_media_client.cc",
+    "mojo_media_client.h",
     "service_factory_impl.cc",
     "service_factory_impl.h",
   ]
@@ -166,14 +154,29 @@ source_set("application") {
 
   deps = [
     ":cdm_service",
-    ":media_client",
     ":renderer_service",
-    "//base",
-    "//mojo/public/c/system:for_component",
     "//mojo/shell/public/cpp",
   ]
 }
 
+source_set("default_application") {
+  if (is_android) {
+    sources = [
+      "android_mojo_media_client.cc",
+    ]
+  } else {
+    sources = [
+      "default_mojo_media_client.cc",
+    ]
+  }
+
+  public_configs = [ ":enable_mojo_media_config" ]
+
+  deps = [
+    ":application",
+  ]
+}
+
 test("media_mojo_unittests") {
   sources = [
     "media_type_converters_unittest.cc",
@@ -200,7 +203,8 @@ mojo_native_application("media") {
   ]
 
   deps = [
-    ":application",
+    ":default_application",
+    "//mojo/logging",
     "//mojo/public/c/system:for_shared_library",
   ]
 }