[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 9c1de12ecb254ff2cd1712e6a5c1c96580c55adb..f3a85919cdfe03ccb60aa58d3414c064e968d269 100644
--- a/headless/public/headless_web_contents.h
+++ b/headless/public/headless_web_contents.h
@@ -112,9 +112,15 @@ class HEADLESS_EXPORT HeadlessWebContents::Builder {
   // 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);
+  enum class TabSocketType {
+    NONE,           // No tabspcket binds created (default).

[Sami, 2017/05/16 13:49:14]

typo: TabSocket

[alex clarke (OOO till 29th), 2017/05/17 09:09:32]

Done.

+    MAIN_WORLD,     // TabSocket bindings available only to the main world.
+    ISOLATED_WORLD  // TabSocket bindings available only to isolated worlds
+                    // created via DevTools protocol.
+  };
+
+  // Sets the type of TabSocket to be created, if any.
+  Builder& SetTabSocketType(TabSocketType type);
 
   // The returned object is owned by HeadlessBrowser. Call
   // HeadlessWebContents::Close() to dispose it.
@@ -154,7 +160,7 @@ class HEADLESS_EXPORT HeadlessWebContents::Builder {
   GURL initial_url_ = GURL("about:blank");
   gfx::Size window_size_;
   std::list<MojoService> mojo_services_;
-  bool create_tab_socket_ = false;
+  TabSocketType tab_socket_type_ = TabSocketType::NONE;
 
   DISALLOW_COPY_AND_ASSIGN(Builder);
 };