Merge pull request #6664 from brave/gyuyoung-brave-browser-importer

Fix deps in //brave/browser/importer

browser/importer/BUILD.gn

@@ -1,34 +1,13 @@
 import("//build/config/features.gni")
 
 source_set("importer") {
-  # Remove when https://github.com/brave/brave-browser/issues/10657 is resolved
-  check_includes = false
   sources = [
-    "brave_external_process_importer_client.cc",
-    "brave_external_process_importer_client.h",
-    "brave_external_process_importer_host.cc",
-    "brave_external_process_importer_host.h",
     "brave_importer_p3a.cc",
     "brave_importer_p3a.h",
-    "brave_in_process_importer_bridge.cc",
-    "brave_in_process_importer_bridge.h",
   ]
 
   deps = [
     "//base",
-    "//brave/common",
-    "//brave/common/importer:interfaces",
-    # For buildflags.h included from chrome/browser/browser_process.h, we are
-    # not including chrome/browser here because of circular dependency.
-    # We should refactor this in the future to be able to add chrome/browser
-    # into importer target's deps.
-    "//chrome/common:buildflags",
     "//chrome/common/importer",
-    # For profile_import.mojom.h from external_process_importer_client.h.
-    # brave_external_process_importer_client.cc refers it indirectly.
-    "//chrome/common/importer:interfaces",
-    "//content/public/browser",
-    "//extensions/buildflags",
-    "//ui/gfx:native_widget_types",
   ]
 }

browser/importer/sources.gni

@@ -0,0 +1,21 @@
+# Copyright (c) 2020 The Brave Authors. All rights reserved.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+brave_chrome_browser_importer_sources = [
+  "//brave/browser/importer/brave_external_process_importer_client.cc",
+  "//brave/browser/importer/brave_external_process_importer_client.h",
+  "//brave/browser/importer/brave_external_process_importer_host.cc",
+  "//brave/browser/importer/brave_external_process_importer_host.h",
+  "//brave/browser/importer/brave_in_process_importer_bridge.cc",
+  "//brave/browser/importer/brave_in_process_importer_bridge.h",
+]
+
+brave_chrome_browser_importer_deps = [
+  "//base",
+  "//brave/common/importer:interfaces",
+  "//content/public/browser",
+  "//extensions/buildflags",
+  "//mojo/public/cpp/bindings:bindings",
+]

browser/sources.gni

@@ -0,0 +1,12 @@
+# Copyright (c) 2020 The Brave Authors. All rights reserved.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import("//brave/browser/importer/sources.gni")
+
+brave_chrome_browser_sources = []
+brave_chrome_browser_sources += brave_chrome_browser_importer_sources
+
+brave_chrome_browser_deps = []
+brave_chrome_browser_deps += brave_chrome_browser_importer_deps

build/config/brave_build.gni

@@ -3,6 +3,7 @@
 # import("//build/config/chrome_build.gni") in compiler.gni
 import("//brave/brave_repack_locales.gni")
 import("//brave/browser/extensions/resources.gni")
+import("//brave/browser/sources.gni")
 import("//brave/build/config/compiler.gni")
 import("//brave/build/features.gni")
 import("//brave/components/sync/sources.gni")

patches/chrome-browser-BUILD.gn.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 98ae3acaf7cf5fbfae0e4c2e0ddb8a087e6d6e23..6e2bf378e03ad08a0e30aa38de11b19b33fa3468 100644
+index 98ae3acaf7cf5fbfae0e4c2e0ddb8a087e6d6e23..fd339ae93d51f85cb850035d6bc0fc896ae05cdc 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
 @@ -2194,6 +2194,7 @@ static_library("browser") {
@@ -10,3 +10,11 @@ index 98ae3acaf7cf5fbfae0e4c2e0ddb8a087e6d6e23..6e2bf378e03ad08a0e30aa38de11b19b
    ]
 
    if (build_with_tflite_lib) {
+@@ -3878,6 +3879,7 @@ static_library("browser") {
+         "task_manager/sampling/shared_sampler_posix.cc",
+       ]
+     }
++    sources += brave_chrome_browser_sources deps += brave_chrome_browser_deps
+   }
+
+   if (is_chromeos) {