Cleanup some incorrect usage of //extensions/common from android and ios (#30251)

2025-07-24 16:26:36 -07:00
parent ed2b475335
commit 181d7e17e1
14 changed files with 63 additions and 56 deletions
@@ -12,7 +12,6 @@ brave_browser_debounce_deps = [
  "//base",
  "//brave/components/debounce/core/browser",
  "//brave/components/debounce/core/common",
-  "//brave/extensions:common",
  "//chrome/common",
  "//components/keyed_service/content",
 ]
@@ -83,7 +83,6 @@ brave_browser_net_deps = [
  "//brave/components/speech_to_text:buildflags",
  "//brave/components/static_redirect_helper",
  "//brave/components/update_client:buildflags",
-  "//brave/extensions:common",
  "//chrome/browser:browser_process",
  "//chrome/browser/profiles",
  "//components/content_settings/core/browser",
@@ -20,7 +20,6 @@ if (enable_request_otr) {
    "//base",
    "//brave/components/request_otr/browser",
    "//brave/components/request_otr/common",
-    "//brave/extensions:common",
    "//chrome/common",
    "//components/keyed_service/content",
  ]
@@ -231,6 +231,7 @@ brave_chrome_browser_deps = [
  "//brave/components/web_discovery/buildflags",
  "//brave/components/webcompat/content/browser",
  "//brave/components/webcompat/core/common",
+  "//brave/extensions:common",
  "//brave/services/network/public/cpp",
  "//brave/third_party/blink/renderer",
  "//chrome/browser:browser_process",
@@ -6,7 +6,16 @@
 #ifndef BRAVE_CHROMIUM_SRC_CONTENT_PUBLIC_COMMON_URL_CONSTANTS_H_
 #define BRAVE_CHROMIUM_SRC_CONTENT_PUBLIC_COMMON_URL_CONSTANTS_H_

+#include "build/build_config.h"
+
+#if BUILDFLAG(IS_IOS)
+// ios cannot include content deps
+namespace content {
+inline constexpr char kChromeUIScheme[] = "chrome";
+}
+#else
 #include <content/public/common/url_constants.h>  // IWYU pragma: export
+#endif

 namespace content {
 inline constexpr char kBraveUIScheme[] = "brave";
@@ -6,6 +6,14 @@
 #ifndef BRAVE_CHROMIUM_SRC_EXTENSIONS_COMMON_CONSTANTS_H_
 #define BRAVE_CHROMIUM_SRC_EXTENSIONS_COMMON_CONSTANTS_H_

+#include "build/build_config.h"
+
+#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_ANDROID)
+// ios and android cannot include extensions deps
+namespace extensions {
+inline constexpr char kExtensionScheme[] = "chrome-extension";
+}
+#else
 #include <extensions/common/constants.h>  // IWYU pragma: export

 inline constexpr int kBraveActionLeftMarginExtra = -2;
@@ -16,5 +24,6 @@ inline constexpr char crl_set_extension_id[] =

 inline constexpr char google_translate_extension_id[] =
    "aapbdbdomjkkjkaonfhkkikfgjllcleb";
+#endif

 #endif  // BRAVE_CHROMIUM_SRC_EXTENSIONS_COMMON_CONSTANTS_H_
@@ -13,7 +13,6 @@ brave_chrome_common_sources = [
 brave_chrome_common_deps = [
  "//base",
  "//brave/common:mojo_bindings",
-  "//brave/extensions:common",
  "//components/version_info:channel",
  "//extensions/buildflags",
  "//services/service_manager",
@@ -96,6 +96,11 @@ test("brave_components_unittests") {
    assert_no_deps += ios_assert_no_deps
    assert_no_deps += [ "//ios/chrome/*" ]
    assert_no_deps += [ "//brave/ios/*" ]
+    assert_no_deps += [
+      "//extensions/common",
+      "//extensions/common:mojom",
+      "//extensions/common/api/*",
+    ]
  }
 }

@@ -43,8 +43,7 @@ source_set("brave_service_key_helper") {
  ]

  deps = [
-    ":constants",
-    "//brave/extensions:common",  # instead of //extensions/common, for iOS
+    "//base",
    "//url",
  ]
 }
@@ -5,19 +5,19 @@

 #include "brave/components/constants/brave_services_key_helper.h"

-#include "brave/components/constants/network_constants.h"
-#include "extensions/common/url_pattern.h"
+#include "base/strings/pattern.h"
 #include "url/gurl.h"
+#include "url/url_constants.h"

 namespace brave {

+inline constexpr char kBraveProxyPattern[] = "*.brave.com";
+inline constexpr char kBraveSoftwareProxyPattern[] = "*.bravesoftware.com";
+
 bool ShouldAddBraveServicesKeyHeader(const GURL& url) {
-  static URLPattern brave_proxy_pattern(URLPattern::SCHEME_HTTPS,
-                                        kBraveProxyPattern);
-  static URLPattern bravesoftware_proxy_pattern(URLPattern::SCHEME_HTTPS,
-                                                kBraveSoftwareProxyPattern);
-  return brave_proxy_pattern.MatchesURL(url) ||
-         bravesoftware_proxy_pattern.MatchesURL(url);
+  return url.SchemeIs(url::kHttpsScheme) &&
+         (base::MatchPattern(url.host(), kBraveProxyPattern) ||
+          base::MatchPattern(url.host(), kBraveSoftwareProxyPattern));
 }

 }  // namespace brave
@@ -8,10 +8,6 @@

 inline constexpr char kExtensionUpdaterDomain[] = "extensionupdater.brave.com";

-inline constexpr char kBraveProxyPattern[] = "https://*.brave.com/*";
-inline constexpr char kBraveSoftwareProxyPattern[] =
-    "https://*.bravesoftware.com/*";
-
 inline constexpr char kBraveUsageStandardPath[] = "/1/usage/brave-core";

 inline constexpr char kBraveReferralsInitPath[] = "/promo/initialize/nonua";
@@ -54,16 +54,6 @@ brave_components_omnibox_browser_deps = [
  "//url",
 ]

-# Looks like an upstream bug:
-# https://chromium-review.googlesource.com/c/chromium/src/+/5814284/7/component
-# s/omnibox/browser/verbatim_match.cc#15. Note, that for iOS we add the header
-# content/public/common/url_constants.h to //brave/extensions:common target.
-if (is_ios) {
-  brave_components_omnibox_browser_deps += [ "//brave/extensions:common" ]
-} else {
-  brave_components_omnibox_browser_deps += [ "//content/public/common" ]
-}
-
 if (enable_commander) {
  brave_components_omnibox_browser_sources += [
    "//brave/components/omnibox/browser/commander_action.cc",
@@ -5,49 +5,52 @@

 import("//extensions/buildflags/buildflags.gni")

-if (is_android || is_ios) {
-  source_set("common") {
-    sources = [
-      "//extensions/common/constants.cc",
+# DO NOT ADD TO THIS LIST
+# Please use an alternative like url_pattern_index::UrlPattern,
+# base::MatchPattern, base::StartsWith,
+# content_settings::ContentSettingsPattern, etc..
+deprecated_visibility_allowed = [
+  "//brave/components/static_redirect_helper",
+  "//brave/components/url_sanitizer/browser",
+  "//brave/components/debounce/core/browser",
+  "//brave/components/ntp_background_images/browser",
+  "//brave/components/psst/browser/core",
+  "//brave/components/request_otr/browser",
+  "//chrome/browser",
+]

-      # "//extensions/common/constants.h", this triggers gn check errors in upstream
+if (enable_extensions) {
+  group("common") {
+    visibility = deprecated_visibility_allowed
+    public_deps = [ "//extensions/common" ]
+  }
+} else {
+  source_set("common") {
+    visibility =
+        deprecated_visibility_allowed + [ "//brave/ios/browser/api/url" ]
+    sources = [
      "//extensions/common/error_utils.cc",
-      "//extensions/common/error_utils.h",
      "//extensions/common/url_pattern.cc",
      "//extensions/common/url_pattern.h",
      "//extensions/common/url_pattern_set.cc",
      "//extensions/common/url_pattern_set.h",
    ]

+    inputs = [
+      "//extensions/common/constants.h",
+      "//extensions/common/error_utils.h",
+    ]
+
    deps = [
      "//base",
-      "//build:chromeos_buildflags",
-      "//components/url_pattern_index",
-      "//device/vr/buildflags",
-      "//extensions/buildflags",
-      "//net:net",
+      "//net",
      "//url",
    ]

    if (is_ios) {
-      sources += [ "//content/public/common/url_constants.h" ]
-      deps += [
-        "//build:chromecast_buildflags",
-        "//build:chromeos_buildflags",
-      ]
+      inputs += [ "//content/public/common/url_constants.h" ]
    } else {
      deps += [ "//content/public/common" ]
    }
-
-    public_deps = [
-      # Upstream bug: common_constants (above) has a dep on
-      # //components/services/app_service/public/mojom, which should have a dep
-      # on //ui/gfx/image/mojom, but doesn't, so we have to include it directly.
-      "//ui/gfx/image/mojom",
-    ]
-  }
-} else {
-  group("common") {
-    public_deps = [ "//extensions/common" ]
  }
 }
@@ -272,7 +272,6 @@ test("brave_unit_tests") {
    "//brave/components/webcompat/content/browser",
    "//brave/components/webcompat/core/common",
    "//brave/components/webcompat_reporter/browser:unittests",
-    "//brave/extensions:common",
    "//brave/mojo/brave_ast_patcher:unit_tests",
    "//brave/net:unit_tests",
    "//brave/third_party/blink/renderer:renderer",