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

headless/BUILD.gn

 # 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.
 
 import("//build/config/chrome_build.gni")
 import("//build/util/process_version.gni")
 import("//headless/headless.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//printing/features/features.gni")
 import("//testing/test.gni")
@@ skipping 325 matching lines @@
   ]
 
   if (is_component_build) {
     sources += [
       "lib/browser/headless_content_browser_client.cc",
       "lib/browser/headless_content_browser_client.h",
       "lib/browser/headless_web_contents_impl.cc",
       "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 += [
       "//components/crash/content/browser",
       "//components/security_state/content",
+      "//third_party/WebKit/public:blink",
     ]
 
     if (enable_basic_printing) {
       deps += [
         "//components/printing/browser",
         "//components/printing/renderer",
       ]
     }
   }
 
@@ skipping 26 matching lines @@
 static_library("headless_renderer") {
   deps = [
     ":headless",
   ]
   if (!is_component_build) {
     sources = [
       "lib/browser/headless_web_contents_impl.cc",
       "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" ]
   }
 }
 
 group("headless_tests") {
   testonly = true
 
   deps = [
     ":headless_browsertests",
@@ skipping 279 matching lines @@
 
 executable("headless_example") {
   sources = [
     "app/headless_example.cc",
   ]
 
   deps = [
     ":headless_shell_lib",
   ]
 }