Revert of [Service Manager] Get rid of dynamic service discovery

chromecast/browser/BUILD.gn

 # Copyright 2015 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/ui.gni")
 import("//chromecast/chromecast.gni")
 import("//services/service_manager/public/service_manifest.gni")
 import("//testing/test.gni")
 import("//tools/grit/grit_rule.gni")
 
@@ skipping 164 matching lines @@
 #    Instead, add the service to the internal counterpart, which is referenced
 #    below.
 #
 # 2) Host an addtional interface in "content_browser" via a ConnectionFilter.
 #    In this case, nothing need be added to this file. Add your interface to the
 #    "provides" field in cast_content_browser_manifest_overlay.json, and use
 #    CastContentBrowserClient::AddConnectionFilters() to register bindings to it
 #    for incoming connections. Remember to add the provided interfaces to the
 #    "requires" field in the manifest of the service that needs them.
 #
-service_manifest("cast_content_browser_manifest_overlay") {
+service_manifest_overlay("cast_content_browser_manifest_overlay") {
   source = "cast_content_browser_manifest_overlay.json"
-  packaged_services = [ "//media/mojo/services:media_manifest" ]
+
+  packaged_services = [ "media" ]
+
+  deps = [
+    "//media/mojo/services:media_manifest",
+  ]
 
   if (chromecast_branding != "public") {
-    overlays = [ "//chromecast/internal/shell/browser:cast_content_browser_internal_manifest_overlay" ]
+    overlays = [ "${root_gen_dir}/cast_content_browser_internal_manifest_overlay.json" ]
+
+    deps += [ "//chromecast/internal/shell/browser:cast_content_browser_internal_manifest_overlay" ]
   }
 }
 
 grit("resources") {
   visibility = [
     ":browser",
     "//chromecast:cast_shell_pak",
   ]
   source = "cast_browser_resources.grd"
   use_qualified_include = true
@@ skipping 69 matching lines @@
       "android/apk/src/org/chromium/chromecast/shell/CastContentWindowAndroid.java",
       "android/apk/src/org/chromium/chromecast/shell/CastCrashHandler.java",
       "android/apk/src/org/chromium/chromecast/shell/CastMetricsHelper.java",
       "android/apk/src/org/chromium/chromecast/shell/CastSysInfoAndroid.java",
       "android/apk/src/org/chromium/chromecast/shell/CastWebContentsActivity.java",
     ]
 
     jni_package = "chromecast"
   }
 }