Reland "media: Refactor MojoMediaClient" with fix.

content/shell/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/features.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/ui.gni")
 import("//build/config/win/console_app.gni")
 import("//build/config/win/manifest.gni")
 import("//media/media_options.gni")
@@ skipping 227 matching lines @@
     "//v8",
 
     #'copy_test_netscape_plugin',  TODO(GYP)
   ]
   if (enable_plugins) {
     deps += [
       "//content/ppapi_plugin",
       "//ppapi:blink_test_plugin",
     ]
   }
-  if (enable_mojo_media != "none") {
-    deps += [ "//media/mojo/services:default_application" ]
+  if (enable_mojo_media == "browser") {
+    deps += [ "//media/mojo/services:application" ]
   }
 
   if (is_win) {
     #'LinkIncremental': '<(msvs_large_module_debug_link_mode)',  TODO(GYP)
     sources += [
       "common/v8_breakpad_support_win.cc",
       "common/v8_breakpad_support_win.h",
     ]
   }
 
@@ skipping 235 matching lines @@
     sources = [
       "app/shell_content_main.cc",
       "app/shell_content_main.h",
     ]
 
     deps = [
       ":content_shell_lib",
     ]
   }
 }