[Reland] Allow headless TabSocket in isolated worlds & remove obsolete logic

headless/lib/browser/headless_web_contents_impl.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_web_contents_impl.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 140 matching lines @@
     HeadlessWebContents::Builder* builder) {
   content::WebContents::CreateParams create_params(builder->browser_context_,
                                                    nullptr);
   create_params.initial_size = builder->window_size_;
 
   std::unique_ptr<HeadlessWebContentsImpl> headless_web_contents =
       base::WrapUnique(new HeadlessWebContentsImpl(
           content::WebContents::Create(create_params),
           builder->browser_context_));
 
-  if (builder->create_tab_socket_) {
+  if (builder->tab_socket_type_ != Builder::TabSocketType::NONE) {
     headless_web_contents->headless_tab_socket_ =
         base::MakeUnique<HeadlessTabSocketImpl>();
+    headless_web_contents->inject_mojo_services_into_isolated_world_ =
+        builder->tab_socket_type_ == Builder::TabSocketType::ISOLATED_WORLD;
 
     builder->mojo_services_.emplace_back(
         TabSocket::Name_,
         base::Bind(
             &ForwardToServiceFactory,
             base::Bind(
                 &HeadlessTabSocketImpl::CreateMojoService,
                 base::Unretained(
                     headless_web_contents->headless_tab_socket_.get()))));
   }
@@ skipping 41 matching lines @@
 
 HeadlessWebContentsImpl::~HeadlessWebContentsImpl() {
   agent_host_->RemoveObserver(this);
   if (render_process_host_)
     render_process_host_->RemoveObserver(this);
 }
 
 void HeadlessWebContentsImpl::RenderFrameCreated(
     content::RenderFrameHost* render_frame_host) {
   if (!mojo_services_.empty()) {
-    render_frame_host->AllowBindings(content::BINDINGS_POLICY_HEADLESS);
+    render_frame_host->AllowBindings(
+        inject_mojo_services_into_isolated_world_
+            ? content::BINDINGS_POLICY_HEADLESS_ISOLATED_WORLD
+            : content::BINDINGS_POLICY_HEADLESS_MAIN_WORLD);
   }
 
   service_manager::BinderRegistry* interface_registry =
       render_frame_host->GetInterfaceRegistry();
 
   for (const MojoService& service : mojo_services_) {
     interface_registry->AddInterface(service.service_name,
                                      service.service_factory,
                                      browser()->BrowserMainThread());
   }
@@ skipping 141 matching lines @@
   initial_url_ = initial_url;
   return *this;
 }
 
 HeadlessWebContents::Builder& HeadlessWebContents::Builder::SetWindowSize(
     const gfx::Size& size) {
   window_size_ = size;
   return *this;
 }
 
-HeadlessWebContents::Builder& HeadlessWebContents::Builder::CreateTabSocket(
-    bool create_tab_socket) {
-  create_tab_socket_ = create_tab_socket;
+HeadlessWebContents::Builder& HeadlessWebContents::Builder::SetTabSocketType(
+    TabSocketType type) {
+  tab_socket_type_ = type;
   return *this;
 }
 
 HeadlessWebContents* HeadlessWebContents::Builder::Build() {
   return browser_context_->CreateWebContents(this);
 }
 
 HeadlessWebContents::Builder::MojoService::MojoService() {}
 
 HeadlessWebContents::Builder::MojoService::MojoService(
     const std::string& service_name,
     const base::Callback<void(mojo::ScopedMessagePipeHandle)>& service_factory)
     : service_name(service_name), service_factory(service_factory) {}
 
 HeadlessWebContents::Builder::MojoService::~MojoService() {}
 
 }  // namespace headless