1 files changed, 17 insertions, 16 deletions
diff --git a/src/core/qtwebengine_sources.gni b/src/core/qtwebengine_sources.gni
index e0eb3e23a..b1361e727 100644
--- a/src/core/qtwebengine_sources.gni
+++ b/src/core/qtwebengine_sources.gni
@@ -2,10 +2,14 @@ import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//components/spellcheck/spellcheck_build_features.gni")
 import("//pdf/features.gni")
-import("//ppapi/features/features.gni")
-import("//printing/features/features.gni")
+import("//ppapi/buildflags/buildflags.gni")
+import("//printing/buildflags/buildflags.gni")
 
 source_set("qtwebengine_spellcheck_sources") {
+  include_dirs = core_include_dirs
+  configs += [
+    "//third_party/boringssl:external_config",
+  ]
   sources = [
     "//chrome/browser/spellchecker/spell_check_host_chrome_impl.cc",
     "//chrome/browser/spellchecker/spell_check_host_chrome_impl.h",
@@ -21,27 +25,26 @@ source_set("qtwebengine_spellcheck_sources") {
   deps = [
     "//components/spellcheck/browser",
     "//components/spellcheck/renderer",
-    "//third_party/boringssl",
-    "//third_party/WebKit/public:blink",
+    "//third_party/blink/public:blink",
     "//third_party/hunspell",
   ]
   if (is_mac && use_browser_spellchecker) {
     sources += [
-        "//chrome/browser/spellchecker/spellcheck_message_filter_platform_mac.cc",
+        "//chrome/browser/spellchecker/spell_check_host_chrome_impl_mac.cc",
     ]
   }
 }
 
 source_set("qtwebengine_sources") {
-  include_dirs = [
-    "//skia/config",
-    "//third_party/boringssl/src/include",
-    "//third_party/skia/include/core"
+  configs += [
+    "//skia:skia_config",
+    "//third_party/boringssl:external_config",
   ]
   deps = [
-    "//chrome/common:features",
-    "//components/nacl/common:features",
-    "//extensions/features:features",
+    "//chrome/common:buildflags",
+    "//components/nacl/common:buildflags",
+    "//extensions/buildflags:buildflags",
+    "//third_party/blink/public/mojom:mojom_platform",
   ]
   sources = [
     "//chrome/common/custom_handlers/protocol_handler.cc",
@@ -123,18 +126,16 @@ source_set("qtwebengine_sources") {
       "//chrome/browser/printing/print_job_manager.h",
       "//chrome/browser/printing/print_job_worker.cc",
       "//chrome/browser/printing/print_job_worker.h",
-      "//chrome/browser/printing/print_job_worker_owner.cc",
-      "//chrome/browser/printing/print_job_worker_owner.h",
     ]
     deps += [
-      "//printing/features:features",
+      "//printing/buildflags:buildflags",
     ]
   }
 
   if (enable_pdf) {
       deps += [
          "//pdf",
-         "//pdf:features",
+         "//pdf:buildflags",
          "//components/printing/browser",
          "//components/printing/renderer",
       ]