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

headless/BUILD.gn

Index: headless/BUILD.gn
diff --git a/headless/BUILD.gn b/headless/BUILD.gn
index 719ee27900f1b89619513e535d12b2ca94dfdc20..e05fd52576e0749b574c737b06a19c5b737b3b77 100644
--- a/headless/BUILD.gn
+++ b/headless/BUILD.gn
@@ -343,6 +343,7 @@ component("headless") {
       "lib/browser/headless_web_contents_impl.h",
       "lib/headless_content_main_delegate.cc",
       "lib/headless_content_main_delegate.h",
+      "lib/renderer/devtools_isolated_world_ids.h",
       "lib/renderer/headless_content_renderer_client.cc",
       "lib/renderer/headless_content_renderer_client.h",
     ]
@@ -350,6 +351,7 @@ component("headless") {
     deps += [
       "//components/crash/content/browser",
       "//components/security_state/content",
+      "//third_party/WebKit/public:blink",
     ]
 
     if (enable_basic_printing) {
@@ -396,12 +398,16 @@ static_library("headless_renderer") {
       "lib/browser/headless_web_contents_impl.h",
       "lib/headless_content_main_delegate.cc",
       "lib/headless_content_main_delegate.h",
+      "lib/renderer/devtools_isolated_world_ids.h",
       "lib/renderer/headless_content_renderer_client.cc",
       "lib/renderer/headless_content_renderer_client.h",
     ]
     deps += [ "//ui/base" ]
     if (enable_basic_printing) {
-      deps += [ "//components/printing/renderer" ]
+      deps += [
+        "//components/printing/renderer",
+        "//third_party/WebKit/public:blink",

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

Did you mean to put this behind enable_basic_priting?

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

Done.

+      ]
     }
     configs += [ ":headless_implementation" ]
   }