[headless] Make browser service manifest overlay configurable.

headless/lib/browser/headless_content_browser_client.cc

 // 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.
 
 #include "headless/lib/browser/headless_content_browser_client.h"
 
 #include <memory>
+#include <set>
 
 #include "base/callback.h"
 #include "base/json/json_reader.h"
 #include "base/memory/ptr_util.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/common/service_names.h"
 #include "headless/grit/headless_lib_resources.h"
 #include "headless/lib/browser/headless_browser_context_impl.h"
 #include "headless/lib/browser/headless_browser_impl.h"
 #include "headless/lib/browser/headless_browser_main_parts.h"
 #include "headless/lib/browser/headless_devtools_manager_delegate.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace headless {
 
+namespace {
+const char kCapabilityPath[] =
+    "interface_provider_specs.navigation:frame.provides.renderer";
+}  // namspace

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

namespace

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

Done.

+
 HeadlessContentBrowserClient::HeadlessContentBrowserClient(
     HeadlessBrowserImpl* browser)
     : browser_(browser) {}
 
 HeadlessContentBrowserClient::~HeadlessContentBrowserClient() {}
 
 content::BrowserMainParts* HeadlessContentBrowserClient::CreateBrowserMainParts(
     const content::MainFunctionParams&) {
   std::unique_ptr<HeadlessBrowserMainParts> browser_main_parts =
       base::MakeUnique<HeadlessBrowserMainParts>(browser_);
@@ skipping 13 matching lines @@
 }
 
 content::DevToolsManagerDelegate*
 HeadlessContentBrowserClient::GetDevToolsManagerDelegate() {
   return new HeadlessDevToolsManagerDelegate(browser_->GetWeakPtr());
 }
 
 std::unique_ptr<base::Value>
 HeadlessContentBrowserClient::GetServiceManifestOverlay(
     const std::string& name) {
-  if (name != content::kBrowserServiceName)
+  if (name != content::kBrowserServiceName ||
+      browser_->options()->mojo_service_names.empty())
     return nullptr;
-  base::StringPiece manifest_contents =
+
+  base::StringPiece manifest_template =
       ui::ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_HEADLESS_BROWSER_MANIFEST_OVERLAY);
-  return base::JSONReader::Read(manifest_contents);
+          IDR_HEADLESS_BROWSER_MANIFEST_OVERLAY_TEMPLATE);
+  std::unique_ptr<base::Value> manifest =
+      base::JSONReader::Read(manifest_template);
+
+  // Add mojo_service_names to renderer capability specified in options.
+  base::DictionaryValue* manifest_dictionary = nullptr;
+  CHECK(manifest->GetAsDictionary(&manifest_dictionary));
+
+  base::ListValue* capability_list = nullptr;
+  CHECK(manifest_dictionary->GetList(kCapabilityPath, &capability_list));
+
+  for (std::string service_name : browser_->options()->mojo_service_names) {
+    capability_list->AppendString(service_name);
+  }
+
+  return manifest;
 }
 
 }  // namespace headless