Moved brave extensions constants to //extensions/common

via chromium_src override of //extensions/common/constants.h/cc

browser/BUILD.gn

@@ -176,6 +176,7 @@ source_set("browser_process") {
     "//content/public/browser",
     "//content/public/common",
     "//extensions/buildflags",
+    "//extensions/common:common_constants",
     "//brave/chromium_src:browser",
     "browsing_data",
     "themes",

browser/brave_content_browser_client_browsertest.cc

@@ -9,7 +9,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "brave/browser/brave_content_browser_client.h"
 #include "brave/common/brave_paths.h"
-#include "brave/common/extensions/extension_constants.h"
 #include "brave/common/pref_names.h"
 #include "brave/components/brave_rewards/browser/buildflags/buildflags.h"
 #include "brave/components/brave_shields/common/brave_shield_constants.h"
@@ -32,6 +31,7 @@
 #include "content/public/test/test_navigation_observer.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
+#include "extensions/common/constants.h"
 #include "net/dns/mock_host_resolver.h"
 
 class BraveContentBrowserClientTest : public InProcessBrowserTest {

browser/brave_content_browser_client_unittest.cc

@@ -10,8 +10,8 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
-#include "brave/common/extensions/extension_constants.h"
 #include "extensions/browser/extension_registry.h"
+#include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_builder.h"
 #endif

browser/brave_wallet/BUILD.gn

@@ -17,5 +17,6 @@ source_set("brave_wallet") {
     "//components/pref_registry",
     "//components/prefs",
     "//extensions/browser",
+    "//extensions/common:common_constants",
   ]
 }

browser/extensions/BUILD.gn

@@ -110,7 +110,7 @@ source_set("extensions") {
   if (ntp_widget_utils_enabled) {
     deps += [
       "//brave/components/ntp_widget_utils/browser",
-    ]    
+    ]
   }
 
   if (ipfs_enabled) {

browser/extensions/api/binance_api.cc

@@ -14,7 +14,6 @@
 #include "brave/browser/profiles/profile_util.h"
 
 #include "brave/common/extensions/api/binance.h"
-#include "brave/common/extensions/extension_constants.h"
 #include "brave/common/pref_names.h"
 #include "brave/browser/binance/binance_service_factory.h"
 #include "brave/components/binance/browser/binance_service.h"
@@ -26,6 +25,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "components/prefs/pref_service.h"
 #include "extensions/browser/extension_util.h"
+#include "extensions/common/constants.h"
 
 namespace {
 

browser/extensions/api/brave_rewards_api.cc

@@ -16,7 +16,6 @@
 #include "brave/browser/extensions/api/brave_action_api.h"
 #include "brave/browser/profiles/profile_util.h"
 #include "brave/common/extensions/api/brave_rewards.h"
-#include "brave/common/extensions/extension_constants.h"
 #include "brave/components/brave_ads/browser/ads_service.h"
 #include "brave/components/brave_ads/browser/ads_service_factory.h"
 #include "brave/components/brave_rewards/browser/rewards_service.h"
@@ -26,6 +25,7 @@
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/web_contents.h"
+#include "extensions/common/constants.h"
 
 using brave_ads::AdsService;
 using brave_ads::AdsServiceFactory;

browser/extensions/api/brave_shields_api.cc

@@ -12,7 +12,6 @@
 #include "brave/browser/extensions/api/brave_action_api.h"
 #include "brave/browser/webcompat_reporter/webcompat_reporter_dialog.h"
 #include "brave/common/extensions/api/brave_shields.h"
-#include "brave/common/extensions/extension_constants.h"
 #include "brave/components/brave_shields/browser/ad_block_base_service.h"
 #include "brave/components/brave_shields/browser/ad_block_custom_filters_service.h"
 #include "brave/components/brave_shields/browser/ad_block_regional_service_manager.h"
@@ -30,6 +29,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_util.h"
+#include "extensions/common/constants.h"
 
 using brave_shields::BraveShieldsWebContentsObserver;
 using brave_shields::ControlType;

browser/extensions/api/brave_shields_api_browsertest.cc

@@ -6,7 +6,6 @@
 #include "base/path_service.h"
 #include "brave/browser/extensions/api/brave_shields_api.h"
 #include "brave/common/brave_paths.h"
-#include "brave/common/extensions/extension_constants.h"
 #include "brave/components/brave_shields/common/brave_shield_constants.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/extensions/api/content_settings/content_settings_api.h"
@@ -25,6 +24,7 @@
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"
+#include "extensions/common/constants.h"
 #include "extensions/common/extension_builder.h"
 #include "net/dns/mock_host_resolver.h"
 

browser/extensions/api/brave_wallet_api.cc

@@ -15,7 +15,6 @@
 #include "brave/browser/profiles/profile_util.h"
 #include "brave/common/brave_wallet_constants.h"
 #include "brave/common/extensions/api/brave_wallet.h"
-#include "brave/common/extensions/extension_constants.h"
 #include "brave/common/pref_names.h"
 #include "brave/grit/brave_generated_resources.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
@@ -26,6 +25,7 @@
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_util.h"
+#include "extensions/common/constants.h"
 #include "brave/browser/brave_wallet/brave_wallet_service_factory.h"
 #include "brave/components/brave_wallet/browser/brave_wallet_service.h"
 #include "ui/base/l10n/l10n_util.h"

browser/extensions/api/brave_wallet_api_browsertest.cc

@@ -8,7 +8,6 @@
 #include "brave/browser/infobars/crypto_wallets_infobar_delegate.h"
 #include "brave/common/brave_paths.h"
 #include "brave/common/brave_wallet_constants.h"
-#include "brave/common/extensions/extension_constants.h"
 #include "brave/common/pref_names.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ -20,6 +19,7 @@
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"
 #include "extensions/browser/extension_registry.h"
+#include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_builder.h"
 #include "extensions/test/extension_test_message_listener.h"

browser/extensions/api/gemini_api.cc

@@ -11,7 +11,6 @@
 #include <vector>
 
 #include "brave/common/extensions/api/gemini.h"
-#include "brave/common/extensions/extension_constants.h"
 #include "brave/browser/gemini/gemini_service_factory.h"
 #include "brave/components/ntp_widget_utils/browser/ntp_widget_utils_region.h"
 #include "brave/components/gemini/browser/gemini_service.h"
@@ -21,6 +20,7 @@
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "extensions/browser/extension_util.h"
+#include "extensions/common/constants.h"
 
 namespace {
 

browser/extensions/brave_component_loader.cc

@@ -13,7 +13,6 @@
 #include "brave/browser/component_updater/brave_component_installer.h"
 #include "brave/common/brave_switches.h"
 #include "brave/common/brave_wallet_constants.h"
-#include "brave/common/extensions/extension_constants.h"
 #include "brave/common/pref_names.h"
 #include "brave/components/brave_component_updater/browser/brave_on_demand_updater.h"
 #include "brave/components/brave_extension/grit/brave_extension.h"
@@ -31,6 +30,7 @@
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
+#include "extensions/common/constants.h"
 
 namespace extensions {
 

browser/extensions/brave_extension_management.cc

@@ -9,14 +9,14 @@
 
 #include "brave/browser/brave_browser_process_impl.h"
 #include "brave/browser/tor/buildflags.h"
-#include "brave/common/extensions/extension_constants.h"
 #include "brave/common/pref_names.h"
 #include "brave/common/tor/pref_names.h"
 #include "brave/browser/extensions/brave_extension_provider.h"
 #include "chrome/browser/extensions/external_policy_loader.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/prefs/pref_service.h"
 #include "extensions/browser/extension_registry.h"
+#include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_urls.h"
 

browser/extensions/brave_extension_provider.cc

@@ -11,10 +11,10 @@
 
 #include "base/strings/utf_string_conversions.h"
 #include "brave/browser/brave_browser_process_impl.h"
-#include "brave/common/extensions/extension_constants.h"
 #include "brave/components/brave_component_updater/browser/local_data_files_service.h"
 #include "brave/components/brave_component_updater/browser/extension_whitelist_service.h"
 #include "brave/grit/brave_generated_resources.h"
+#include "extensions/common/constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {

browser/extensions/brave_extension_service.cc

@@ -9,11 +9,11 @@
 
 #include "base/one_shot_event.h"
 #include "brave/browser/profiles/profile_util.h"
-#include "brave/common/extensions/extension_constants.h"
 #include "chrome/browser/extensions/api/content_settings/content_settings_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "extensions/browser/extension_action.h"
 #include "extensions/browser/extension_action_manager.h"
+#include "extensions/common/constants.h"
 
 namespace extensions {
 

browser/extensions/brave_wallet_apitest.cc

@@ -6,11 +6,11 @@
 #include "base/path_service.h"
 #include "brave/common/brave_paths.h"
 #include "brave/common/brave_wallet_constants.h"
-#include "brave/common/extensions/extension_constants.h"
 #include "brave/common/pref_names.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/test/browser_test.h"
+#include "extensions/common/constants.h"
 #include "extensions/test/result_catcher.h"
 
 namespace extensions {

browser/extensions/brave_webtorrent_navigation_throttle.cc

@@ -8,7 +8,6 @@
 #include "base/bind.h"
 #include "brave/browser/extensions/brave_component_loader.h"
 #include "brave/browser/profiles/profile_util.h"
-#include "brave/common/extensions/extension_constants.h"
 #include "brave/common/pref_names.h"
 #include "brave/common/url_constants.h"
 #include "brave/components/brave_webtorrent/browser/buildflags/buildflags.h"
@@ -22,6 +21,7 @@
 #include "content/public/common/url_constants.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
+#include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 
 #if BUILDFLAG(ENABLE_BRAVE_WEBTORRENT)

browser/extensions/brave_webtorrent_navigation_throttle_unittest.cc

@@ -13,7 +13,6 @@
 #include "base/files/scoped_temp_dir.h"
 #include "brave/browser/profiles/brave_profile_manager.h"
 #include "brave/browser/profiles/profile_util.h"
-#include "brave/common/extensions/extension_constants.h"
 #include "brave/common/pref_names.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/load_error_reporter.h"
@@ -31,6 +30,7 @@
 #include "content/public/test/test_renderer_host.h"
 #include "content/public/test/web_contents_tester.h"
 #include "extensions/browser/extension_system.h"
+#include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_builder.h"
 #include "testing/gtest/include/gtest/gtest.h"

browser/infobars/BUILD.gn

@@ -38,6 +38,7 @@ source_set("infobars") {
       "//brave/common:pref_names",
       "//brave/components/brave_wallet/browser:browser",
       "//components/user_prefs:user_prefs",
+      "//extensions/common:common_constants",
     ]
   }
 

browser/infobars/crypto_wallets_infobar_delegate.cc

@@ -11,7 +11,6 @@
 #include "brave/browser/brave_wallet/brave_wallet_service_factory.h"
 #include "brave/browser/ui/brave_pages.h"
 #include "brave/common/brave_wallet_constants.h"
-#include "brave/common/extensions/extension_constants.h"
 #include "brave/common/pref_names.h"
 #include "brave/common/url_constants.h"
 #include "brave/components/brave_wallet/browser/brave_wallet_service.h"
@@ -25,6 +24,7 @@
 #include "components/strings/grit/components_strings.h"
 #include "components/user_prefs/user_prefs.h"
 #include "content/public/browser/browser_context.h"
+#include "extensions/common/constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/vector_icons.h"
 

browser/net/brave_torrent_redirect_network_delegate_helper.cc

@@ -10,7 +10,6 @@
 
 #include "base/strings/strcat.h"
 #include "base/strings/string_util.h"
-#include "brave/common/extensions/extension_constants.h"
 #include "brave/common/network_constants.h"
 #include "brave/components/brave_webtorrent/browser/webtorrent_util.h"
 #include "extensions/common/constants.h"

browser/ui/BUILD.gn

@@ -317,6 +317,7 @@ source_set("ui") {
       "//chrome/browser/extensions",
       "//components/sessions",
       "//extensions/browser",
+      "//extensions/common:common_constants",
     ]
   }
 

browser/ui/brave_actions/brave_action_icon_with_badge_image_source.cc

@@ -8,10 +8,10 @@
 #include <algorithm>
 
 #include "base/strings/utf_string_conversions.h"
-#include "brave/common/extensions/constants.h"
 #include "cc/paint/paint_flags.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
 #include "chrome/grit/theme_resources.h"
+#include "extensions/common/constants.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
@@ -22,8 +22,6 @@
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/skia_paint_util.h"
 
-using namespace brave_actions;  // NOLINT
-
 base::Optional<int>
 BraveActionIconWithBadgeImageSource::GetCustomGraphicSize() {
   return kBraveActionGraphicSize;

browser/ui/brave_actions/brave_action_view_controller.cc

@@ -11,7 +11,6 @@
 
 #include "brave/browser/ui/brave_actions/brave_action_icon_with_badge_image_source.h"
 #include "brave/browser/profiles/profile_util.h"
-#include "brave/common/extensions/extension_constants.h"
 #include "chrome/browser/extensions/extension_view_host.h"
 #include "chrome/browser/extensions/extension_view_host_factory.h"
 #include "chrome/browser/profiles/profile.h"
@@ -21,6 +20,7 @@
 #include "components/sessions/content/session_tab_helper.h"
 #include "components/vector_icons/vector_icons.h"
 #include "extensions/browser/extension_action.h"
+#include "extensions/common/constants.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/canvas_image_source.h"

browser/ui/toolbar/brave_location_bar_model_delegate.cc

@@ -13,7 +13,7 @@
 #include "extensions/buildflags/buildflags.h"
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
-#include "brave/common/extensions/extension_constants.h"
+#include "extensions/common/constants.h"
 #endif
 
 BraveLocationBarModelDelegate::BraveLocationBarModelDelegate(Browser* browser) :

browser/ui/toolbar/brave_location_bar_model_delegate_unittest.cc

@@ -11,7 +11,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
-#include "brave/common/extensions/extension_constants.h"
+#include "extensions/common/constants.h"
 #endif
 
 using BraveLocationBarModelDelegateTest = testing::Test;

browser/ui/toolbar/brave_toolbar_actions_model.cc

@@ -4,8 +4,8 @@
 
 #include "brave/browser/ui/toolbar/brave_toolbar_actions_model.h"
 
-#include "brave/common/extensions/extension_constants.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
+#include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 
 bool BraveToolbarActionsModel::ShouldAddExtension(const extensions::Extension* extension) {

browser/ui/views/brave_actions/brave_action_view.cc

@@ -7,12 +7,12 @@
 
 #include <memory>
 
-#include "brave/common/extensions/constants.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/layout_constants.h"
 #include "chrome/browser/ui/views/chrome_layout_provider.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_ink_drop_util.h"
+#include "extensions/common/constants.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect.h"
@@ -52,7 +52,7 @@ SkPath BraveActionView::GetHighlightPath() const {
   // making it inset so that the badge can show outside it in the
   // fake margin on the right that we are creating.
   SkPath path;
-  gfx::Insets highlight_insets(0, 0, 0, brave_actions::kBraveActionRightMargin);
+  gfx::Insets highlight_insets(0, 0, 0, kBraveActionRightMargin);
   gfx::Rect rect(size());
   rect.Inset(highlight_insets);
   const int radii = ChromeLayoutProvider::Get()->GetCornerRadiusMetric(