[headless] Make browser service manifest overlay configurable.

headless/public/headless_browser.h

 // 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.
 
 #ifndef HEADLESS_PUBLIC_HEADLESS_BROWSER_H_
 #define HEADLESS_PUBLIC_HEADLESS_BROWSER_H_
 
 #include <memory>
+#include <set>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "headless/public/headless_browser_context.h"
 #include "headless/public/headless_export.h"
@@ skipping 89 matching lines @@
 
   // Run the browser without renderer sandbox. This option can be
   // a security risk and should be used with caution.
   bool disable_sandbox;
 
   // Choose the GL implementation to use for rendering. A suitable
   // implementantion is selected by default. Setting this to an empty
   // 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;
 
   // Address of the HTTP/HTTPS proxy server to use. The system proxy settings
   // are used by default.
   net::HostPortPair proxy_server;
 
   // Comma-separated list of rules that control how hostnames are mapped. See
   // chrome::switches::kHostRules for a description for the format.
@@ skipping 24 matching lines @@
   Builder();
   ~Builder();
 
   // Browser-wide settings.
 
   Builder& EnableDevToolsServer(const net::IPEndPoint& endpoint);
   Builder& SetMessagePump(base::MessagePump* message_pump);
   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.
 
   Builder& SetUserAgent(const std::string& user_agent);
   Builder& SetProxyServer(const net::HostPortPair& proxy_server);
   Builder& SetHostResolverRules(const std::string& host_resolver_rules);
   Builder& SetWindowSize(const gfx::Size& window_size);
   Builder& SetUserDataDir(const base::FilePath& user_data_dir);
   Builder& SetIncognitoMode(bool incognito_mode);
 
@@ skipping 32 matching lines @@
 // the main loop, it will only return after HeadlessBrowser::Shutdown() is
 // called, returning the exit code for the process. It is not possible to
 // initialize the browser again after it has been torn down.
 int HeadlessBrowserMain(
     HeadlessBrowser::Options options,
     const base::Callback<void(HeadlessBrowser*)>& on_browser_start_callback);
 
 }  // namespace headless
 
 #endif  // HEADLESS_PUBLIC_HEADLESS_BROWSER_H_