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

components/nacl/broker/BUILD.gn

Index: components/nacl/broker/BUILD.gn
diff --git a/components/nacl/broker/BUILD.gn b/components/nacl/broker/BUILD.gn
index 08e448918740fac2b014b26dc5627fca42286c5a..3a2b36079185cfdfb90281875921ac97fffa52b5 100644
--- a/components/nacl/broker/BUILD.gn
+++ b/components/nacl/broker/BUILD.gn
@@ -4,6 +4,7 @@
 
 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
@@ -29,6 +30,7 @@ source_set("broker") {
     "//ipc",
     "//mojo/edk/system",
     "//sandbox",
+    "//services/service_manager/public/cpp",
   ]
 
   if (current_cpu == target_cpu) {
@@ -36,6 +38,10 @@ source_set("broker") {
   } else {
     deps += [ ":content_dummy" ]
   }
+
+  data_deps = [
+    ":nacl_broker_manifest",
+  ]
 }
 
 # This exists just to make 'gn check' happy with :broker.  It can't depend
@@ -169,3 +175,8 @@ if (current_cpu == "x86") {
     ]
   }
 }
+
+service_manifest("nacl_broker_manifest") {
+  name = "nacl_broker"
+  source = "nacl_broker_manifest.json"
+}