Change the NaCl loader and broker processes to use the ServiceManager.

components/nacl/broker/BUILD.gn

 # Copyright 2016 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/compiler/compiler.gni")
+import("//services/service_manager/public/service_manifest.gni")
 
 # This file builds nacl64.exe, which is a 64-bit x86 Windows executable
 # used only in the 32-bit x86 Windows build.  The :broker code runs both
 # in nacl64.exe and in the 32-bit chrome executable, to launch
 # nacl64.exe and communicate with it.
 
 assert(enable_nacl)
 assert(is_win)
 assert(target_cpu == "x86")
 
 source_set("broker") {
   sources = [
     "nacl_broker_listener.cc",
     "nacl_broker_listener.h",
   ]
 
   deps = [
     "//base",
     "//components/nacl/common:debug_exception_handler",
     "//components/nacl/common:minimal",
     "//components/nacl/common:switches",
     "//content/public/common:static_switches",
     "//ipc",
     "//mojo/edk/system",
     "//sandbox",
+    "//services/service_manager/public/cpp",
   ]
 
   if (current_cpu == target_cpu) {
     deps += [ "//content/public/common" ]
   } else {
     deps += [ ":content_dummy" ]
   }
+
+  data_deps = [
+    ":nacl_broker_manifest",
+  ]
 }
 
 # This exists just to make 'gn check' happy with :broker.  It can't depend
 # on //content/public/common or anything like that, because that would
 # bring in lots more stuff that should not be in the nacl64.exe build.
 source_set("content_dummy") {
   check_includes = false
   sources = [
     "//content/public/common/sandbox_init.h",
     "//content/public/common/sandboxed_process_launcher_delegate.h",
@@ skipping 113 matching lines @@
       "//chrome/installer/util:with_no_strings",
       "//components/browser_watcher:browser_watcher_client",
       "//components/flags_ui:switches",
       "//components/policy:generated",
       "//content/public/common:static_switches",
       "//ipc",
       "//third_party/kasko",
     ]
   }
 }
+
+service_manifest("nacl_broker_manifest") {
+  name = "nacl_broker"
+  source = "nacl_broker_manifest.json"
+}