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

components/nacl/loader/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/features.gni")
 import("//build/config/nacl/config.gni")
+import("//services/service_manager/public/service_manifest.gni")
 import("//testing/test.gni")
 
 assert(enable_nacl)
 
 # This is separate so it can be used by ../broker:nacl64.
 source_set("minimal") {
   sources = [
     "nacl_ipc_adapter.cc",
     "nacl_ipc_adapter.h",
     "nacl_listener.cc",
@@ skipping 14 matching lines @@
     ":minimal_content_dummy",
     "//base",
     "//components/nacl/common:minimal",
     "//crypto",
     "//ipc",
     "//mojo/edk/system",
     "//native_client/src/trusted/service_runtime:sel_main_chrome",
     "//ppapi/c",
     "//ppapi/proxy:ipc",
     "//sandbox",
+    "//services/service_manager/public/cpp",
   ]
 }
 
 # This exists just to make 'gn check' happy with :minimal and
 # :nacl_helper_win_64 (below).  They can't depend on //content/public/common
 # or anything like that, because that would bring in lots more than counts
 # as "minimal" (stuff that should not be in the nacl64.exe build).
 source_set("minimal_content_dummy") {
   check_includes = false
   sources = [
     "//content/public/common/child_process_sandbox_support_linux.h",
-    "//content/public/common/content_descriptors.h",
-    "//content/public/common/content_switches.h",
     "//content/public/common/main_function_params.h",
-    "//content/public/common/mojo_channel_switches.h",
     "//content/public/common/sandbox_init.h",
   ]
 
   # Deps required by the above headers.
   deps = [
     "//media:media_features",
   ]
 }
 
 source_set("loader") {
   public_deps = [
     ":minimal",
   ]
   deps = [
     "//components/nacl/common",
     "//content/public/common",
     "//ppapi/shared_impl",
+    "//services/service_manager/public/cpp",
   ]
 
   data_deps = [
+    ":nacl_loader_manifest",
     "//ppapi/native_client:irt",
     "//ppapi/native_client/src/untrusted/pnacl_support_extension",
   ]
 }
 
 test("nacl_loader_unittests") {
   sources = [
     "nacl_ipc_adapter_unittest.cc",
     "nacl_validation_query_unittest.cc",
     "run_all_unittests.cc",
@@ skipping 102 matching lines @@
       "//sandbox",
     ]
   }
 }
 
 if (is_nacl_nonsfi) {
   executable("nacl_helper_nonsfi_nexe") {
     output_name = "nacl_helper_nonsfi"
     set_sources_assignment_filter([])
     sources = [
       # TODO(brettw) can this just depend on //components/nacl/common?

[bradnelson, 2016/12/16 19:00:15]

Think you can drop the TODO too.

[Sam McNally, 2016/12/18 23:16:54]

Done.

-      "../common/nacl_messages.cc",
-      "../common/nacl_messages.h",
-      "../common/nacl_types.cc",
-      "../common/nacl_types.h",
-      "../common/nacl_types_param_traits.cc",
-      "../common/nacl_types_param_traits.h",
       "nacl_helper_linux.cc",
       "nacl_helper_linux.h",
       "nacl_trusted_listener.cc",
       "nacl_trusted_listener.h",
       "nonsfi/nonsfi_listener.cc",
       "nonsfi/nonsfi_listener.h",
       "nonsfi/nonsfi_main.cc",
       "nonsfi/nonsfi_main.h",
     ]
     deps = [
       ":nacl_helper_nonsfi_sandbox",
       "//base",
+      "//components/nacl/common:minimal",
       "//components/nacl/common:switches",
       "//components/tracing",
       "//content",
       "//ipc",
       "//mojo/edk/system",
       "//native_client/src/nonsfi/irt:nacl_sys_private",
       "//native_client/src/nonsfi/loader:elf_loader",
 
       # Normally libnacl is included implicitly by libc and is part of the
       # toolchain. But //build/config/nacl:compiler uses -nodefaultlibs and so
       # omits the default libnacl. When the nonsfi toolchain is more complete
       # and that kludge is no longer required, this dependency should be
       # removed.
       "//native_client/src/untrusted/nacl",
       "//ppapi/proxy",
       "//sandbox/linux:sandbox",
+      "//services/service_manager/public/cpp",
     ]
   }
 
   source_set("nacl_helper_nonsfi_sandbox") {
     set_sources_assignment_filter([])
     sources = [
       "nonsfi/nonsfi_sandbox.cc",
       "nonsfi/nonsfi_sandbox.h",
       "sandbox_linux/nacl_sandbox_linux.cc",
       "sandbox_linux/nacl_sandbox_linux.h",
     ]
     deps = [
       "//base",
+      "//components/nacl/common:minimal",
       "//components/nacl/common:switches",
       "//content",
       "//sandbox/linux:sandbox",
       "//sandbox/linux:sandbox_services_headers",
     ]
   }
 
   copy("nacl_helper_nonsfi_copy") {
     sources = [
       "${root_out_dir}/nacl_helper_nonsfi",
@@ skipping 32 matching lines @@
       "${root_out_dir}/nacl_helper_nonsfi_unittests_main",
     ]
     outputs = [
       "${root_build_dir}/{{source_file_part}}",
     ]
     deps = [
       ":nacl_helper_nonsfi_unittests_main",
     ]
   }
 }
+
+service_manifest("nacl_loader_manifest") {
+  name = "nacl_loader"
+  source = "nacl_loader_manifest.json"
+}