1 files changed, 96 insertions, 14 deletions
diff --git a/src/core/configure/BUILD.root.gn.in b/src/core/configure/BUILD.root.gn.in
index efbb28075..01bf84b70 100644
--- a/src/core/configure/BUILD.root.gn.in
+++ b/src/core/configure/BUILD.root.gn.in
@@ -97,7 +97,7 @@ config("cpp17_config") {
 }
 
 shared_library("QtWebEngineCore") {
-  rsp_types = [ "objects", "archives", "libs" ]
+  rsp_types = [ "objects", "archives", "libs", "lflags"]
   configs += [
     ":cpp17_config",
     ":QtWebEngineCore_config",
@@ -109,21 +109,25 @@ shared_library("QtWebEngineCore") {
     "//third_party/boringssl/src/include",
     "//third_party/skia/include/core"
   ]
-  defines = [ "CHROMIUM_VERSION=\"" + chromium_version[0] + "\"" ]
+  defines = [ "CHROMIUM_VERSION=" + chromium_version[0] ]
   deps = [
     "//base",
     "//components/autofill/content/browser",
     "//components/autofill/content/renderer",
     "//components/autofill/core/browser",
+    "//components/autofill/core/browser:buildflags",
     "//components/cdm/renderer",
+    "//components/embedder_support/origin_trials",
     "//components/error_page/common",
     "//components/favicon/content",
+    "//components/gcm_driver",
     "//components/history/content/browser",
     "//components/keyed_service/content",
     "//components/navigation_interception",
     "//components/network_hints/browser",
     "//components/network_hints/common:mojo_bindings",
     "//components/network_hints/renderer",
+    "//components/signin/public/base",
     "//components/visitedlink/browser",
     "//components/visitedlink/renderer",
     "//components/web_cache/browser",
@@ -135,6 +139,7 @@ shared_library("QtWebEngineCore") {
     "//content/public/app",
     "//content/public/browser",
     "//content",
+    "//gpu/ipc:gl_in_process_context",
     "//media:media_buildflags",
     "//net",
     "//services/proxy_resolver:lib",
@@ -212,6 +217,32 @@ source_set("qtwebengine_spellcheck_sources") {
   }
 }
 
+source_set("devtools_sources") {
+  configs += [ ":cpp17_config" ]
+  deps = [
+    "//components/zoom",
+    "//third_party/blink/public/mojom:mojom_platform",
+    ]
+  sources = [
+     "//chrome/browser/devtools/devtools_eye_dropper.cc",
+     "//chrome/browser/devtools/devtools_eye_dropper.h",
+     "//chrome/browser/devtools/devtools_file_helper.cc",
+     "//chrome/browser/devtools/devtools_file_helper.h",
+     "//chrome/browser/devtools/devtools_file_system_indexer.cc",
+     "//chrome/browser/devtools/devtools_file_system_indexer.h",
+     "//chrome/browser/devtools/devtools_file_watcher.cc",
+     "//chrome/browser/devtools/devtools_file_watcher.h",
+     "//chrome/browser/devtools/url_constants.cc",
+     "//chrome/browser/devtools/url_constants.h",
+     "//chrome/browser/devtools/devtools_ui_bindings.cc",
+     "//chrome/browser/devtools/devtools_ui_bindings.h",
+     "//chrome/browser/devtools/devtools_settings.cc",
+     "//chrome/browser/devtools/devtools_settings.h",
+     "//chrome/browser/devtools/devtools_embedder_message_dispatcher.cc",
+     "//chrome/browser/devtools/devtools_embedder_message_dispatcher.h",
+  ]
+}
+
 source_set("qtwebengine_sources") {
   configs += [
     ":cpp17_config",
@@ -219,12 +250,16 @@ source_set("qtwebengine_sources") {
     "//third_party/boringssl:external_config",
   ]
   deps = [
+    ":devtools_sources",
     "//build:branding_buildflags",
+    "//build/config/chromebox_for_meetings:buildflags",
     "//chrome/browser:dev_ui_browser_resources_grit",
     "//chrome/browser/resources/net_internals:resources",
+    "//chrome/browser/signin:identity_manager_provider",
     "//chrome/common:buildflags",
-    "//chromeos/components/chromebox_for_meetings/buildflags",
+    "//chrome/common:version_header",
     "//components/custom_handlers",
+    "//components/embedder_support:embedder_support",
     "//components/nacl/common:buildflags",
     "//components/performance_manager",
     "//components/plugins/renderer/",
@@ -239,15 +274,51 @@ source_set("qtwebengine_sources") {
   sources = [
     "//chrome/browser/accessibility/accessibility_ui.cc",
     "//chrome/browser/accessibility/accessibility_ui.h",
-    "//chrome/browser/devtools/devtools_eye_dropper.cc",
-    "//chrome/browser/devtools/devtools_eye_dropper.h",
+    "//chrome/browser/gcm/gcm_product_util.cc",
+    "//chrome/browser/gcm/gcm_product_util.h",
+    "//chrome/browser/gcm/gcm_profile_service_factory.cc",
+    "//chrome/browser/gcm/gcm_profile_service_factory.h",
+    "//chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc",
+    "//chrome/browser/gcm/instance_id/instance_id_profile_service_factory.h",
     "//chrome/browser/media/webrtc/desktop_media_list.h",
     "//chrome/browser/net/chrome_mojo_proxy_resolver_factory.cc",
     "//chrome/browser/net/chrome_mojo_proxy_resolver_factory.h",
     "//chrome/browser/prefs/chrome_command_line_pref_store.cc",
     "//chrome/browser/prefs/chrome_command_line_pref_store.h",
+    "//chrome/browser/profiles/incognito_helpers.cc",
+    "//chrome/browser/profiles/incognito_helpers.h",
+    "//chrome/browser/profiles/profile_keyed_service_factory.cc",
+    "//chrome/browser/profiles/profile_keyed_service_factory.h",
+    "//chrome/browser/profiles/profile_selections.cc",
+    "//chrome/browser/profiles/profile_selections.h",
     "//chrome/browser/profiles/profile.cc",
     "//chrome/browser/profiles/profile.h",
+    "//chrome/browser/push_messaging/push_messaging_app_identifier.cc",
+    "//chrome/browser/push_messaging/push_messaging_app_identifier.h",
+    "//chrome/browser/push_messaging/push_messaging_constants.cc",
+    "//chrome/browser/push_messaging/push_messaging_constants.h",
+    "//chrome/browser/push_messaging/push_messaging_features.cc",
+    "//chrome/browser/push_messaging/push_messaging_features.h",
+    "//chrome/browser/push_messaging/push_messaging_notification_manager.cc",
+    "//chrome/browser/push_messaging/push_messaging_notification_manager.h",
+    "//chrome/browser/push_messaging/push_messaging_refresher.cc",
+    "//chrome/browser/push_messaging/push_messaging_refresher.h",
+    "//chrome/browser/push_messaging/push_messaging_service_factory.cc",
+    "//chrome/browser/push_messaging/push_messaging_service_factory.h",
+    "//chrome/browser/push_messaging/push_messaging_service_impl.cc",
+    "//chrome/browser/push_messaging/push_messaging_service_impl.h",
+    "//chrome/browser/push_messaging/push_messaging_utils.cc",
+    "//chrome/browser/push_messaging/push_messaging_utils.h",
+    "//chrome/browser/signin/chrome_signin_client.cc",
+    "//chrome/browser/signin/chrome_signin_client.h",
+    "//chrome/browser/signin/chrome_signin_client_factory.cc",
+    "//chrome/browser/signin/chrome_signin_client_factory.h",
+    "//chrome/browser/signin/force_signin_verifier.cc",
+    "//chrome/browser/signin/force_signin_verifier.h",
+    "//chrome/browser/signin/identity_manager_factory.cc",
+    "//chrome/browser/signin/identity_manager_factory.h",
+    "//chrome/browser/signin/signin_util.cc",
+    "//chrome/browser/signin/signin_util.h",
     "//chrome/browser/tab_contents/form_interaction_tab_helper.cc",
     "//chrome/browser/tab_contents/form_interaction_tab_helper.h",
     "//chrome/browser/tab_contents/web_contents_collection.cc",
@@ -274,6 +345,8 @@ source_set("qtwebengine_sources") {
     "//chrome/common/url_constants.h",
     "//chrome/common/webui_url_constants.cc",
     "//chrome/common/webui_url_constants.h",
+    "//components/embedder_support/user_agent_utils.cc",
+    "//components/embedder_support/user_agent_utils.h",
   ]
   if (enable_extensions) {
     deps += [
@@ -317,12 +390,23 @@ source_set("qtwebengine_sources") {
       "//extensions/common/url_pattern.h",
     ]
   }
-  if (is_linux) {
+  if (is_linux || is_win) {
     sources += [
       "//chrome/browser/ui/webui/sandbox/sandbox_internals_ui.cc",
       "//chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h",
     ]
   }
+  if (is_win) {
+    sources += [
+      "//chrome/browser/net/chrome_mojo_proxy_resolver_win.cc",
+      "//chrome/browser/net/chrome_mojo_proxy_resolver_win.h",
+      "//chrome/browser/ui/webui/sandbox/sandbox_handler.cc",
+      "//chrome/browser/ui/webui/sandbox/sandbox_handler.h",
+    ]
+    deps += [ "//services/proxy_resolver_win",
+              "//services/proxy_resolver_win/public/mojom",
+    ]
+  }
   if (enable_spellcheck) {
     deps += [
       ":qtwebengine_spellcheck_sources",
@@ -363,7 +447,7 @@ source_set("qtwebengine_sources") {
 
   if (enable_webrtc && enable_extensions) {
     deps += [
-      "//chrome/browser/resources/media:webrtc_logs_resources",
+      "//chrome/browser/resources/media:resources",
       "//components/upload_list",
       "//components/webrtc_logging/browser",
       "//components/webrtc_logging/common",
@@ -448,6 +532,7 @@ repack("qtwebengine_repack_resources") {
     "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
     "$root_gen_dir/content/content_resources.pak",
     "$root_gen_dir/content/dev_ui_content_resources.pak",
+    "$root_gen_dir/content/indexed_db_resources.pak",
     "$root_gen_dir/content/quota_internals_resources.pak",
     "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
     "$root_gen_dir/net/net_resources.pak",
@@ -465,6 +550,7 @@ repack("qtwebengine_repack_resources") {
      "//content/browser/resources/media:resources",
      "//content/browser/tracing:resources",
      "//content:content_resources",
+     "//content/browser/resources/indexed_db:resources",
      "//content/browser/resources/quota:resources",
      "//content:dev_ui_content_resources_grit",
      "//mojo/public/js:resources",
@@ -494,10 +580,10 @@ repack("qtwebengine_repack_resources") {
   }
   if (enable_webrtc && enable_extensions) {
     sources += [
-      "$root_gen_dir/chrome/webrtc_logs_resources.pak",
+        "$root_gen_dir/chrome/media_resources.pak",
     ]
     deps += [
-      "//chrome/browser/resources/media:webrtc_logs_resources",
+        "//chrome/browser/resources/media:resources",
     ]
   }
   if (enable_pdf) {
@@ -514,7 +600,6 @@ repack("qtwebengine_repack_resources_100") {
   sources = [
     "$root_gen_dir/chrome/renderer_resources_100_percent.pak",
     "$root_gen_dir/components/components_resources_100_percent.pak",
-    "$root_gen_dir/content/app/resources/content_resources_100_percent.pak",
     "$root_gen_dir/third_party/blink/public/resources/blink_scaled_resources_100_percent.pak",
     "$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
   ]
@@ -522,7 +607,6 @@ repack("qtwebengine_repack_resources_100") {
   deps = [
     "//chrome/renderer:resources_grit",
     "//components/resources:components_scaled_resources_grit",
-    "//content/app/resources:resources_grit",
     "//third_party/blink/public:scaled_resources_100_percent",
     "//ui/resources:ui_resources_grd_grit"
   ]
@@ -540,7 +624,6 @@ repack("qtwebengine_repack_resources_200") {
   sources = [
     "$root_gen_dir/chrome/renderer_resources_200_percent.pak",
     "$root_gen_dir/components/components_resources_200_percent.pak",
-    "$root_gen_dir/content/app/resources/content_resources_200_percent.pak",
     "$root_gen_dir/third_party/blink/public/resources/blink_scaled_resources_200_percent.pak",
     "$root_gen_dir/ui/resources/ui_resources_200_percent.pak",
   ]
@@ -548,7 +631,6 @@ repack("qtwebengine_repack_resources_200") {
   deps = [
     "//chrome/renderer:resources_grit",
     "//components/resources:components_scaled_resources_grit",
-    "//content/app/resources:resources_grit",
     "//third_party/blink/public:scaled_resources_200_percent",
     "//ui/resources:ui_resources_grd_grit"
   ]
@@ -609,7 +691,7 @@ if (enable_extensions) {
 
 if (enable_spellcheck) {
   shared_library("convert_dict") {
-    rsp_types = [ "objects", "archives", "libs" ]
+    rsp_types = [ "objects", "archives", "libs", "lflags" ]
     configs += [ "//build/config/compiler:wexit_time_destructors" ]
     deps = [
       "//chrome/tools/convert_dict:lib",