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

headless/public/headless_web_contents.h

Index: headless/public/headless_web_contents.h
diff --git a/headless/public/headless_web_contents.h b/headless/public/headless_web_contents.h
index 166c197945d4abd41137a4e0feff8efda6e6f103..4df2c32de93e5883a8a1c01d56df5fe4059e30d7 100644
--- a/headless/public/headless_web_contents.h
+++ b/headless/public/headless_web_contents.h
@@ -113,8 +113,10 @@ class HEADLESS_EXPORT HeadlessWebContents::Builder {
   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.
@@ -155,6 +157,7 @@ class HEADLESS_EXPORT HeadlessWebContents::Builder {
   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);
 };