Reland "media: Refactor MojoMediaClient" with fix.

chrome/browser/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("//build/config/chrome_build.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//chrome/common/features.gni")
 import("//media/media_options.gni")
@@ skipping 940 matching lines @@
   if (!enable_autofill_dialog || is_android || is_ios) {
     sources -= [
       "autofill/validation_rules_storage_factory.cc",
       "autofill/validation_rules_storage_factory.h",
     ]
   }
   if (enable_media_router) {
     deps += [ "//chrome/browser/media/router" ]
   }
 
-  if (enable_mojo_media != "none") {
-    deps += [ "//media/mojo/services:default_application" ]
+  if (enable_mojo_media == "browser") {
+    deps += [ "//media/mojo/services:application" ]
+  } else if (enable_mojo_media != "none") {
+    configs += [ "//media/mojo/services:enable_mojo_media_config" ]
   }
 
   if (enable_wayland_server) {
     deps += [
       "//components/exo",
       "//components/exo/wayland",
     ]
     sources += [
       "chrome_browser_main_extra_parts_exo.cc",
       "chrome_browser_main_extra_parts_exo.h",
@@ skipping 362 matching lines @@
         rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome")
     deps = [
       "//components/google/core/browser",
       "//components/omnibox/browser",
       "//components/rlz",
       "//components/search_engines",
       "//rlz:rlz_lib",
     ]
   }
 }