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

content/public/browser/content_browser_client.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
 
 #include <stddef.h>
 
 #include <map>
@@ skipping 689 matching lines @@
   virtual void RegisterUnsandboxedOutOfProcessServices(
       OutOfProcessServiceMap* services) {}
 
   // Allow the embedder to provide a dictionary loaded from a JSON file
   // resembling a service manifest whose capabilities section will be merged
   // with content's own for |name|. Additional entries will be appended to their
   // respective sections.
   virtual std::unique_ptr<base::Value> GetServiceManifestOverlay(
       const std::string& name);
 
+  virtual std::vector<std::pair<std::string, int>> GetExtraServiceManifests();

[piman, 2016/11/23 18:08:11]

nit: what are the members of the pair? Could you change the std::pair into an
explicit struct to give them proper names (as opposed to "first" and "second"
which aren't particularly descriptive at the call sites).

Separately, please document this new function.

[Sam McNally, 2016/11/24 02:10:41]

Done.

+
   // Allows to override the visibility state of a RenderFrameHost.
   // |visibility_state| should not be null. It will only be set if needed.
   virtual void OverridePageVisibilityState(
       RenderFrameHost* render_frame_host,
       blink::WebPageVisibilityState* visibility_state) {}
 
   // Allows an embedder to provide its own PresentationServiceDelegate
   // implementation. Returns nullptr if unavailable.
   virtual PresentationServiceDelegate* GetPresentationServiceDelegate(
       WebContents* web_contents);
@@ skipping 68 matching lines @@
   // by |render_frame_host|. This may be called multiple times if there is more
   // than one source candidate in the same render frame.
   virtual void CreateMediaRemoter(RenderFrameHost* render_frame_host,
                                   media::mojom::RemotingSourcePtr source,
                                   media::mojom::RemoterRequest request) {}
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_