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

headless/public/headless_web_contents.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_WEB_CONTENTS_H_
 #define HEADLESS_PUBLIC_HEADLESS_WEB_CONTENTS_H_
 
 #include <list>
 #include <string>
 #include <utility>
@@ skipping 95 matching lines @@
   // Set an initial URL to ensure that the renderer gets initialized and
   // eventually becomes ready to be inspected. See
   // HeadlessWebContents::Observer::DevToolsTargetReady. The default URL is
   // about:blank.
   Builder& SetInitialURL(const GURL& initial_url);
 
   // Specify the initial window size (default is configured in browser options).
   Builder& SetWindowSize(const gfx::Size& size);
 
   // Whether or not a headless tab socket should be created, to allow JS -> C++
-  // embedder communications.
-  Builder& CreateTabSocket(bool create_tab_socket);
+  // embedder communications.  If |in_isolated_worlds| is true the bindings will
+  // will be available only in isolated worlds, otherwise they will be available
+  // only in the main world.
+  Builder& CreateTabSocket(bool create_tab_socket, bool in_isolated_worlds);

[Sami, 2017/05/12 17:18:02]

Maybe it would be good to be explicit at this level too, e.g., enum
TabSocketType { NONE, MAIN_WORLD, ISOLATED_WORLD }.

[alex clarke (OOO till 29th), 2017/05/15 09:50:57]

Done.

 
   // The returned object is owned by HeadlessBrowser. Call
   // HeadlessWebContents::Close() to dispose it.
   HeadlessWebContents* Build();
 
  private:
   friend class HeadlessBrowserImpl;
   friend class HeadlessBrowserContextImpl;
   friend class HeadlessWebContentsImpl;
 
@@ skipping 20 matching lines @@
    private:
     DISALLOW_COPY_AND_ASSIGN(MojoService);
   };
 
   HeadlessBrowserContextImpl* browser_context_;
 
   GURL initial_url_ = GURL("about:blank");
   gfx::Size window_size_;
   std::list<MojoService> mojo_services_;
   bool create_tab_socket_ = false;
+  bool create_tab_socket_in_isolated_worlds_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(Builder);
 };
 
 }  // namespace headless
 
 #endif  // HEADLESS_PUBLIC_HEADLESS_WEB_CONTENTS_H_