Merge webkit_set target into //WebKit/source/controller to fix deps race (issue #2339)

BUILD.gn

@@ -231,47 +231,6 @@ group("cef") {
 # libcef static target.
 #
 
-# Target for building code that accesses Blink internals. Included from the
-# //third_party/WebKit/Source/web target.
-source_set("webkit_set") {
-  sources = [
-    "libcef/renderer/webkit_glue.cc",
-    "libcef/renderer/webkit_glue.h",
-  ]
-
-  configs += [
-    "libcef/features:config",
-    "//build/config:precompiled_headers",
-
-    # Blink-internal include paths.
-    "//third_party/WebKit/Source/core:core_include_dirs",
-  ]
-
-  include_dirs = [
-    # Blink code uses paths relative to these directories. We need them because
-    # we include Blink headers.
-    "//third_party/WebKit",
-    "//third_party/WebKit/public/platform",
-    "//third_party/WebKit/public/web",
-    "//third_party/WebKit/Source",
-    "$root_gen_dir/blink",
-    "$root_gen_dir/third_party/WebKit",
-  ]
-
-  defines = [
-    # Blink-internal defines.
-    "BLINK_IMPLEMENTATION=1",
-    "INSIDE_BLINK",
-  ]
-
-  deps = [
-    "//skia",
-    "//third_party/icu",
-    "//third_party/boringssl",
-    "//v8",
-  ]
-}
-
 if (is_win) {
   # Target for building code that accesses chrome_elf internals. Included from
   # the //chrome_elf:crash target. Defined as a static_library instead of a

patch/patches/component_build_1617.patch

@@ -13,14 +13,23 @@ index 4393a8fac233..860715e86900 100644
    explicit ContentServiceManagerMainDelegate(const ContentMainParams& params);
    ~ContentServiceManagerMainDelegate() override;
 diff --git third_party/WebKit/Source/controller/BUILD.gn third_party/WebKit/Source/controller/BUILD.gn
-index 714113da5d67..08130f97b76c 100644
+index 714113da5d67..2a8feb621f4b 100644
 --- third_party/WebKit/Source/controller/BUILD.gn
 +++ third_party/WebKit/Source/controller/BUILD.gn
-@@ -16,6 +16,7 @@ component("controller") {
-   output_name = "blink_controller"
+@@ -25,6 +25,7 @@ component("controller") {
  
-   deps = [
-+    "//cef:webkit_set",
-     "//skia",
-     "//third_party/WebKit/Source/core",
-     "//third_party/WebKit/Source/modules",
+   configs += [
+     "//build/config/compiler:wexit_time_destructors",
++    "//cef/libcef/features:config",
+     "//third_party/WebKit/Source:config",
+     "//third_party/WebKit/Source:inside_blink",
+     "//third_party/WebKit/Source:non_test_config",
+@@ -39,6 +40,8 @@ component("controller") {
+     "ControllerExport.h",
+     "OomInterventionImpl.cpp",
+     "OomInterventionImpl.h",
++    "//cef/libcef/renderer/webkit_glue.cc",
++    "//cef/libcef/renderer/webkit_glue.h",
+   ]
+ 
+   if (is_mac) {