[Chromecast] Update manifests to use content_packaged_services.

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 142 matching lines @@
     ]
 
     deps += [ ":jni_headers" ]
   }
 
   if (use_ozone) {
     deps += [ "//ui/ozone" ]
   }
 }
 
-# HOW THIS WORKS
 # This target generates an "overlay" interface spec, allowing the Cast build to
 # declare specific behavior and requirements for the "content_browser" service.
 # This is accomplished by generating a JSON file, which is packed into
-# cast_shell.pak, and loaded at runtime. This can be used to:
+# cast_shell.pak, and loaded at runtime. This can be used to host addtional
+# interfaces in "content_browser".
 #
-# 1) Host Cast-specific embedded services in the browser process.
-#    To host an embedded service, add the service's name to the list of
-#    "packages" in this target, and add the target that generates that service's
-#    manifest to "deps", like so:
-#
-#      packages = [ "foo" ]
-#      deps = [ "//path/to/foo/service:foo_manifest" ]
-#
-#    You must also register the "foo" service with the content client. See
-#    CastContentBrowserClient::RegisterInProcessServices() for details.
-#
-#    **NOTE**
-#    If your service's manifest is in chromecast/internal, do not add it here!
-#    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.
-#
+# NOTE: Do not add packaged_services here! packaged_services should instead be
+# added to "cast_content_packaged_services_manifest_overlay" below or
+# its internal counterpart. Please see that target for more details.
 service_manifest("cast_content_browser_manifest_overlay") {
   source = "cast_content_browser_manifest_overlay.json"
-  packaged_services = [ "//media/mojo/services:media_manifest" ]
 
   if (chromecast_branding != "public") {
     overlays = [ "//chromecast/internal/shell/browser:cast_content_browser_internal_manifest_overlay" ]
   }
 }
 
+# This target is for packaged services that will run in the main (browser)
+# process. To host an embedded service, add the service's manifest target to the
+# list of "packaged_services" in this target, like so:
+#
+#   package_services += [ "//path/to/foo/service:foo_manifest" ]
+#
+# You must also register the "foo" service with the content client. See
+# CastContentBrowserClient::RegisterInProcessServices() for details.
+#
+# NOTE: If your service's manifest is in chromecast/internal, do not add it
+# here! Instead, add the service to the internal counterpart, which is
+# referenced below.
+service_manifest("cast_content_packaged_services_manifest_overlay") {
+  source = "cast_content_packaged_services_manifest_overlay.json"
+
+  packaged_services = [ "//media/mojo/services:media_manifest" ]
+
+  if (chromecast_branding != "public") {
+    overlays = [ "//chromecast/internal/shell/browser:cast_content_packaged_services_internal_manifest_overlay" ]
+  }
+}
+
 grit("resources") {
   visibility = [
     ":browser",
     "//chromecast:cast_shell_pak",
   ]
   source = "cast_browser_resources.grd"
   use_qualified_include = true
   output_dir = "$root_gen_dir/chromecast/browser"
   outputs = [
     "grit/cast_browser_resources.h",
     "cast_browser_resources.pak",
   ]
 
   deps = [
     ":cast_content_browser_manifest_overlay",
+    ":cast_content_packaged_services_manifest_overlay",
   ]
 }
 
 source_set("test_support") {
   testonly = true
   sources = [
     "test/cast_browser_test.cc",
     "test/cast_browser_test.h",
   ]
 
@@ skipping 54 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"
   }
 }