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

content/public/browser/content_browser_client.h

Index: content/public/browser/content_browser_client.h
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 96946a06bac2747889a3d4ad24e0346b69dd07fb..0760f3fd50a8c6a1326018864ba063377a57c4cc 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -707,6 +707,8 @@ class CONTENT_EXPORT ContentBrowserClient {
   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(