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

components/nacl/common/BUILD.gn

Index: components/nacl/common/BUILD.gn
diff --git a/components/nacl/common/BUILD.gn b/components/nacl/common/BUILD.gn
index 5440c723a484dfc4ed4c2c8a8cc68814691d6e19..0f7230df2d0329d959db8720fc64e72f84138e38 100644
--- a/components/nacl/common/BUILD.gn
+++ b/components/nacl/common/BUILD.gn
@@ -18,6 +18,8 @@ if (enable_nacl) {
       "nacl_renderer_messages.cc",
       "nacl_renderer_messages.h",
       "nacl_sandbox_type.h",
+      "nacl_service.cc",
+      "nacl_service.h",
       "nacl_types.cc",
       "nacl_types.h",
       "nacl_types_param_traits.cc",
@@ -25,14 +27,18 @@ if (enable_nacl) {
     ]
 
     public_deps = [
+      ":minimal_content_dummy",
       ":switches",
     ]
 
     deps = [
-      ":minimal_content_dummy",
       "//base",
       "//base:base_static",
+      "//content/public/common:service_names",
       "//ipc",
+      "//ipc:mojom",
+      "//mojo/edk/system",
+      "//services/service_manager/public/cpp",
     ]
   }
 
@@ -43,7 +49,9 @@ if (enable_nacl) {
   source_set("minimal_content_dummy") {
     check_includes = false
     sources = [
+      "//content/public/common/content_descriptors.h",
       "//content/public/common/content_switches.h",
+      "//content/public/common/mojo_channel_switches.h",
       "//content/public/common/process_type.h",
       "//content/public/common/sandbox_type.h",
     ]