Revert of Reland "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 39384c979e2ee6956a29ed0d201a27771da06705..22925805d09a79ec19194e6caa37d32f37404639 100644
--- a/media/mojo/services/BUILD.gn
+++ b/media/mojo/services/BUILD.gn
@@ -150,24 +150,30 @@ source_set("application") {
     "service_factory_impl.h",
   ]
 
+  public_configs = [ ":enable_mojo_media_config" ]
+
+  deps = [
+    ":cdm_service",
+    ":renderer_service",
+    "//mojo/shell/public/cpp",
+  ]
+}
+
+source_set("default_application") {
   if (is_android) {
-    sources += [
+    sources = [
       "android_mojo_media_client.cc",
-      "android_mojo_media_client.h",
     ]
   } else {
-    sources += [
+    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",
+    ":application",
   ]
 }
 
@@ -197,7 +203,7 @@ mojo_native_application("media") {
   ]
 
   deps = [
-    ":application",
+    ":default_application",
     "//mojo/logging",
     "//mojo/public/c/system:for_shared_library",
   ]
@@ -226,9 +232,7 @@ mojo_native_application("media_apptests") {
     "//testing/gtest",
   ]
 
-  data_deps = [
-    ":media",
-  ]
+  data_deps = [ ":media" ]
 }
 
 mojo_native_application("media_pipeline_integration_apptests") {
@@ -238,9 +242,7 @@ mojo_native_application("media_pipeline_integration_apptests") {
     "//media/test:mojo_pipeline_integration_tests",
   ]
 
-  data_deps = [
-    ":media",
-  ]
+  data_deps = [ ":media" ]
 }
 
 group("services") {