[headless] Make browser service manifest overlay configurable.

headless/public/headless_browser.h

Index: headless/public/headless_browser.h
diff --git a/headless/public/headless_browser.h b/headless/public/headless_browser.h
index 954b79e0db4609324864c8ef209bbf7db28be0d8..62fe2bd704a8ac15c82419b41bc18c3f18c9e959 100644
--- a/headless/public/headless_browser.h
+++ b/headless/public/headless_browser.h
@@ -6,6 +6,7 @@
 #define HEADLESS_PUBLIC_HEADLESS_BROWSER_H_
 
 #include <memory>
+#include <set>
 #include <string>
 #include <unordered_map>
 #include <vector>
@@ -115,6 +116,10 @@ struct HeadlessBrowser::Options {
   // string can be used to disable GL rendering (e.g., WebGL support).
   std::string gl_implementation;
 
+  // Names of mojo services exposed by the browser to the renderer. These
+  // services will be added to the browser's service manifest.
+  std::set<std::string> mojo_service_names;

[Sami, 2016/11/11 17:41:15]

Any reason for this not to be an unordered_set?

[Eric Seckler, 2016/11/14 10:23:14]

Nope, leftover from the previous approach. Done!

+
   // Default per-context options, can be specialized on per-context basis.
 
   std::string user_agent;
@@ -159,6 +164,7 @@ class HeadlessBrowser::Options::Builder {
   Builder& SetSingleProcessMode(bool single_process_mode);
   Builder& SetDisableSandbox(bool disable_sandbox);
   Builder& SetGLImplementation(const std::string& gl_implementation);
+  Builder& AddMojoServiceName(const std::string& mojo_service_name);
 
   // Per-context settings.