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 0f688580d74862282e3f1233ba5946adc951bfab..39384c979e2ee6956a29ed0d201a27771da06705 100644
--- a/media/mojo/services/BUILD.gn
+++ b/media/mojo/services/BUILD.gn
@@ -150,30 +150,24 @@ 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 = [
-    ":application",
+    ":cdm_service",
+    ":renderer_service",
+    "//mojo/shell/public/cpp",
   ]
 }
 
@@ -203,7 +197,7 @@ mojo_native_application("media") {
   ]
 
   deps = [
-    ":default_application",
+    ":application",
     "//mojo/logging",
     "//mojo/public/c/system:for_shared_library",
   ]