Fix-up.

browser/component_updater/BUILD.gn

@@ -28,4 +28,23 @@ source_set("component_updater") {
   if (is_win) {
     deps += [ "//chrome/installer/util:with_no_strings" ]
   }
+
+  if (is_android) {
+    public_deps = [ ":zxcvbn_data_component_installer" ]
+  }
+}
+
+source_set("zxcvbn_data_component_installer") {
+  sources = [
+    "//chrome/browser/component_updater/zxcvbn_data_component_installer.cc",
+    "//chrome/browser/component_updater/zxcvbn_data_component_installer.h",
+  ]
+
+  deps = [
+    "//base",
+    "//components/component_updater",
+    "//components/password_manager/core/common:features",
+    "//components/update_client",
+    "//third_party/zxcvbn-cpp",
+  ]
 }

browser/sources.gni

@@ -398,8 +398,6 @@ if (is_android) {
     "//brave/browser/sync/brave_sync_devices_android.h",
     "//chrome/browser/bookmarks/bookmark_html_writer.cc",
     "//chrome/browser/bookmarks/bookmark_html_writer.h",
-    "//chrome/browser/component_updater/zxcvbn_data_component_installer.cc",
-    "//chrome/browser/component_updater/zxcvbn_data_component_installer.h",
     "//chrome/browser/importer/profile_writer.cc",
     "//chrome/browser/importer/profile_writer.h",
   ]
@@ -424,7 +422,6 @@ if (is_android) {
     "//brave/components/brave_sync:sync_service_impl_helper",
     "//chrome/android:jni_headers",
     "//components/sync_device_info",
-    "//third_party/zxcvbn-cpp",
   ]
 } else {
   brave_chrome_browser_sources += [

chromium_src/chrome/browser/component_updater/registration.cc

@@ -40,6 +40,7 @@ void RegisterComponentsForUpdate() {
         cus, p3a_service->remote_config_manager()->GetWeakPtr());
   }
 #if BUILDFLAG(IS_ANDROID)
+  // Currently behind !BUILDFLAG(IS_ANDROID) in upstream.
   RegisterZxcvbnDataComponent(cus);
 #endif  // BUILDFLAG(IS_ANDROID)
 }

components/password_manager/core/browser/ui/BUILD.gn

@@ -0,0 +1,20 @@
+# Copyright (c) 2025 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 https://mozilla.org/MPL/2.0/.
+
+source_set("ui") {
+  if (is_android) {
+    sources = [
+      "//components/password_manager/core/browser/ui/weak_check_utility.cc",
+      "//components/password_manager/core/browser/ui/weak_check_utility.h",
+    ]
+
+    deps = [
+      "//base",
+      "//third_party/zxcvbn-cpp",
+    ]
+  } else {
+    public_deps = [ "//components/password_manager/core/browser/ui" ]
+  }
+}

components/password_manager/core/browser/ui/sources.gni

@@ -1,20 +0,0 @@
-# Copyright (c) 2025 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 https://mozilla.org/MPL/2.0/.
-
-brave_chrome_components_password_manager_core_browser_ui_sources = []
-
-brave_chrome_components_password_manager_core_browser_ui_deps = []
-
-if (is_android) {
-  brave_chrome_components_password_manager_core_browser_ui_sources += [
-    "//components/password_manager/core/browser/ui/reuse_check_utility.cc",
-    "//components/password_manager/core/browser/ui/reuse_check_utility.h",
-    "//components/password_manager/core/browser/ui/weak_check_utility.cc",
-    "//components/password_manager/core/browser/ui/weak_check_utility.h",
-  ]
-
-  brave_chrome_components_password_manager_core_browser_ui_deps +=
-      [ "//third_party/zxcvbn-cpp" ]
-}

patches/components-password_manager-core-browser-ui-BUILD.gn.patch

@@ -1,12 +0,0 @@
-diff --git a/components/password_manager/core/browser/ui/BUILD.gn b/components/password_manager/core/browser/ui/BUILD.gn
-index ba4c9464ef10e9f65c1615b39c93929ce6bb67a7..366378c4c091ca741589b1f1878902d4ee9d75b7 100644
---- a/components/password_manager/core/browser/ui/BUILD.gn
-+++ b/components/password_manager/core/browser/ui/BUILD.gn
-@@ -74,6 +74,7 @@ source_set("ui") {
-     ]
-     deps += [ "//third_party/zxcvbn-cpp" ]
-   }
-+  import("//brave/components/password_manager/core/browser/ui/sources.gni") sources += brave_chrome_components_password_manager_core_browser_ui_sources deps += brave_chrome_components_password_manager_core_browser_ui_deps
- }
- 
- source_set("unit_tests") {