Reland of land "media: Refactor MojoMediaClient" with fix.

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("//testing/test.gni")
 import("//mojo/public/mojo_application.gni")
 
 # Target naming conventions:
 # - converters: C++/Mojo type converters.
@@ skipping 132 matching lines @@
 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",
   ]
 
+  if (is_android) {
+    sources += [
+      "android_mojo_media_client.cc",
+      "android_mojo_media_client.h",
+    ]
+  } else {
+    sources += [
+      "default_mojo_media_client.cc",
+      "default_mojo_media_client.h",
+    ]
+  }
+
   public_configs = [ ":enable_mojo_media_config" ]
 
   deps = [
     ":cdm_service",
     ":renderer_service",
     "//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",
   ]
 
   deps = [
     ":converters",
     "//base",
     "//base/test:test_support",
     "//media",
     "//media/base:test_support",
     "//media/mojo/interfaces",
     "//mojo/edk/system",
     "//mojo/edk/test:run_all_unittests",
     "//mojo/environment:chromium",
     "//testing/gmock",
     "//testing/gtest",
   ]
 }
 
 mojo_native_application("media") {
   sources = [
     "main.cc",
   ]
 
   deps = [
-    ":default_application",
+    ":application",
     "//mojo/logging",
     "//mojo/public/c/system:for_shared_library",
   ]
 }
 
 # Note, the following tests must be loaded via mojo_runner as an app, e.g.
 #
 #   mojo/tools/apptest_runner.py
 #     --apptest-filter mojo:media_apptests out/Debug
 #
 #   mojo/tools/apptest_runner.py
 #     --apptest-filter mojo:media_pipeline_integration_apptests out/Debug
 #
 mojo_native_application("media_apptests") {
   testonly = true
 
   sources = [
     "media_apptest.cc",
   ]
 
   deps = [
     ":proxy",
     "//media/base:test_support",
     "//mojo/shell/public/cpp:test_support",
     "//testing/gmock",
     "//testing/gtest",
   ]
 
-  data_deps = [ ":media" ]
+  data_deps = [
+    ":media",
+  ]
 }
 
 mojo_native_application("media_pipeline_integration_apptests") {
   testonly = true
 
   deps = [
     "//media/test:mojo_pipeline_integration_tests",
   ]
 
-  data_deps = [ ":media" ]
+  data_deps = [
+    ":media",
+  ]
 }
 
 group("services") {
   public_deps = [
     ":proxy",
   ]
 
   if (!is_component_build) {
     public_deps += [ ":media" ]
   }
 }
 
 group("tests") {
   testonly = true
   deps = [
     ":media_mojo_unittests",
   ]
 
   if (!is_component_build) {
     deps += [
       ":media_apptests",
       ":media_pipeline_integration_apptests",
     ]
   }
 }