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

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 22925805d09a79ec19194e6caa37d32f37404639..39384c979e2ee6956a29ed0d201a27771da06705 100644
--- a/media/mojo/services/BUILD.gn
+++ b/media/mojo/services/BUILD.gn
@@ -150,6 +150,18 @@
     "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 = [
@@ -159,24 +171,6 @@
   ]
 }
 
-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",
@@ -203,7 +197,7 @@
   ]
 
   deps = [
-    ":default_application",
+    ":application",
     "//mojo/logging",
     "//mojo/public/c/system:for_shared_library",
   ]
@@ -232,7 +226,9 @@
     "//testing/gtest",
   ]
 
-  data_deps = [ ":media" ]
+  data_deps = [
+    ":media",
+  ]
 }
 
 mojo_native_application("media_pipeline_integration_apptests") {
@@ -242,7 +238,9 @@
     "//media/test:mojo_pipeline_integration_tests",
   ]
 
-  data_deps = [ ":media" ]
+  data_deps = [
+    ":media",
+  ]
 }
 
 group("services") {