Replace "src/" includes with <> in chromium_src. (#30096)

This change updates how brave/chromium_src overrides can reference original files: it adds ability to use #include <...> along with #include "src/...". This is enabled by replacing -I../../brave/chromium_src with -iquote../../brave_chromium_src, which adds an include search path only for #include "..." directives. With this approach, other files in the build tree can reference brave/chromium_src overrides using #include "...", while the overrides themselves can reference original Chromium files using #include <...>. Since Chromium uses #include "..." for all in-tree files, we can leverage this convention and configure our overrides so that we can drop support for #include "src/" later by removing -I../../.. and making rbe_exec_root modification obsolete (the main goal).
2025-07-24 17:37:44 +07:00
parent 155a209f61
commit a41bf5350b
1511 changed files with 1653 additions and 1671 deletions
@@ -74,7 +74,6 @@ hooks = [
    'pattern': '.',
    'action': ['python3', 'third_party/reclient_configs/src/configure_reclient.py',
               '--src_dir=..',
-               '--exec_root=../..',
               '--custom_py=third_party/reclient_configs/brave_custom/brave_custom.py'],
  },
  {
@@ -29,14 +29,6 @@ config("brave_chromium_src_support") {
    # An invalid option warning is generated in this case.
    asmflags = iquote_flags
  }
-
-  # Add lowest priority "//.." include search path to be able to include original
-  # Chromium files using "src/" prefix.
-  # Adding the search path using "cflags" instead of "include_dirs" is important,
-  # because it should have the lowest priority to not break compile steps when a
-  # path clash is possible: //base/macros.h vs //third_party/v8/src/base/macros.h.
-  relative_root_dir = rebase_path("//..", root_build_dir)
-  cflags += [ "-I${relative_root_dir}" ]
 }

 # Config to support //base build without redirect_cc to build redirect_cc itself.
@@ -298,8 +298,6 @@ const Config = function () {
  this.rbeService = getEnvConfig(['rbe_service']) || ''
  this.rbeTlsClientAuthCert = getEnvConfig(['rbe_tls_client_auth_cert']) || ''
  this.rbeTlsClientAuthKey = getEnvConfig(['rbe_tls_client_auth_key']) || ''
-  // Make sure "src/" is a part of RBE "exec_root" to allow "src/" files as inputs.
-  this.rbeExecRoot = this.rootDir
  this.realRewrapperDir =
    process.env.RBE_DIR || path.join(this.srcDir, 'buildtools', 'reclient')
  this.braveStatsApiKey = getEnvConfig(['brave_stats_api_key']) || ''
@@ -625,7 +623,6 @@ Config.prototype.buildArgs = function () {
  }

  if (this.useRemoteExec) {
-    args.rbe_exec_root = this.rbeExecRoot
    args.reclient_bin_dir = path.join(this.nativeRedirectCCDir)
  } else {
    args.cc_wrapper = path.join(this.nativeRedirectCCDir, 'redirect_cc')
@@ -475,7 +475,6 @@ const util = {
      use_remoteexec: config.useRemoteExec,
      use_reclient: config.useRemoteExec,
      use_siso: false,
-      rbe_exec_root: config.rbeExecRoot,
      reclient_bin_dir: config.realRewrapperDir,
      real_rewrapper: path.join(config.realRewrapperDir, 'rewrapper'),
    }
@@ -26,7 +26,7 @@ def CheckOverriddenHeadersDeclareIWYUExport(input_api, output_api):
    file_filter = lambda f: input_api.FilterSourceFile(
        f, files_to_check=files_to_check, files_to_skip=files_to_skip)

-    include_prefixes = ('#include <', '#include "src/', '#include "../gen/')
+    include_prefixes = ('#include <', '#include "../gen/')
    nolint = 'NOLINT'
    expected_suffix = '// IWYU pragma: export'

@@ -43,7 +43,7 @@ void AwPermissionManager::SetOriginCanReadEnumerateDevicesVideoLabels(
 #define SetOriginCanReadEnumerateDevicesVideoLabels \
  SetOriginCanReadEnumerateDevicesVideoLabels_ChromiumImpl

-#include "src/android_webview/browser/aw_permission_manager.cc"
+#include <android_webview/browser/aw_permission_manager.cc>

 #undef SetOriginCanReadEnumerateDevicesAudioLabels
 #undef SetOriginCanReadEnumerateDevicesVideoLabels
@@ -13,7 +13,7 @@
      const url::Origin& origin, bool video);                    \
  void SetOriginCanReadEnumerateDevicesAudioLabels

-#include "src/android_webview/browser/aw_permission_manager.h"  // IWYU pragma: export
+#include <android_webview/browser/aw_permission_manager.h>  // IWYU pragma: export

 #undef SetOriginCanReadEnumerateDevicesAudioLabels

@@ -26,6 +26,6 @@ bool AwWebContentsDelegate::CheckMediaAccessPermission(

 #define CheckMediaAccessPermission CheckMediaAccessPermission_ChromiumImpl

-#include "src/android_webview/browser/aw_web_contents_delegate.cc"
+#include <android_webview/browser/aw_web_contents_delegate.cc>

 #undef CheckMediaAccessPermission
@@ -14,7 +14,7 @@
      const url::Origin& security_origin, blink::mojom::MediaStreamType type); \
  bool CheckMediaAccessPermission

-#include "src/android_webview/browser/aw_web_contents_delegate.h"  // IWYU pragma: export
+#include <android_webview/browser/aw_web_contents_delegate.h>  // IWYU pragma: export

 #undef CheckMediaAccessPermission

@@ -8,7 +8,7 @@
 #define LoadTrustTokenKeyCommitmentsComponent \
  LoadTrustTokenKeyCommitmentsComponent_ChromiumImpl

-#include "src/android_webview/browser/component_updater/trust_token_key_commitments_component_loader.cc"
+#include <android_webview/browser/component_updater/trust_token_key_commitments_component_loader.cc>
 #undef LoadTrustTokenKeyCommitmentsComponent

 namespace android_webview {
@@ -5,10 +5,10 @@

 #include "android_webview/common/aw_features.h"

-#include "src/android_webview/common/aw_features.cc"
-
 #include "base/feature_override.h"

+#include <android_webview/common/aw_features.cc>
+
 namespace android_webview {
 namespace features {

@@ -3,11 +3,11 @@
 * 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/. */

-#include "src/base/json/json_reader.cc"
-
 #include "base/notimplemented.h"
 #include "third_party/rust/serde_json_lenient/v0_2/wrapper/lib.rs.h"

+#include <base/json/json_reader.cc>
+
 namespace serde_json_lenient {

 // TODO(https://github.com/brave/brave-browser/issues/47120): These methods are
@@ -5,4 +5,4 @@

 #include <algorithm>

-#include "src/brave/third_party/bitcoin-core/src/src/crypto/sha256.cpp"
+#include <brave/third_party/bitcoin-core/src/src/crypto/sha256.cpp>
@@ -20,7 +20,7 @@ using string = ::std::string;
 #define throw CHECK(false) <<
 #define ios_base brave
 #define failure string
-#include "src/brave/third_party/bitcoin-core/src/src/serialize.h"  // IWYU pragma: export
+#include <brave/third_party/bitcoin-core/src/src/serialize.h>  // IWYU pragma: export
 #undef throw
 #undef ios_base
 #undef failure
@@ -7,4 +7,4 @@
 #undef __x86_64__
 #endif

-#include "src/brave/third_party/ethash/src/lib/keccak/keccak.c"
+#include <brave/third_party/ethash/src/lib/keccak/keccak.c>
@@ -7,7 +7,7 @@
 #define BRAVE_CHROMIUM_SRC_BUILD_BUILDFLAG_H_

 // This file is used in rc.exe which doesn't receive low priority additional
-// global include to support #include "src/...".
+// global include to support #include <...>.
 // #include_next is used instead to include original upstream file.
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wgnu-include-next"
@@ -24,13 +24,6 @@ class BraveDepsChecker(DepsChecker):
            directory_rules, _ = super(DepsChecker, self)._ApplyDirectoryRules(
                directory_rules, root_src_dir_path_norm)

-            # Add `+src/...` rule.
-            root_src_relative_dir = 'src/' + posixpath.relpath(
-                root_src_dir_path_norm, NormalizePath(self.base_directory))
-            directory_rules.AddRule('+' + root_src_relative_dir,
-                                    root_src_relative_dir,
-                                    'Src rule for ' + root_src_relative_dir)
-
            # Add `+../gen/...` rule.
            root_src_relative_dir = '../gen/' + posixpath.relpath(
                root_src_dir_path_norm, NormalizePath(self.base_directory))
@@ -8,5 +8,5 @@
 #include "brave/app/brave_main_delegate.h"

 #define ChromeMainDelegate BraveMainDelegate
-#include "src/chrome/app/android/chrome_main_delegate_android.cc"
+#include <chrome/app/android/chrome_main_delegate_android.cc>
 #undef ChromeMainDelegate
@@ -9,7 +9,7 @@
 #include "brave/app/brave_main_delegate.h"

 #define ChromeMainDelegate BraveMainDelegate
-#include "src/chrome/app/android/chrome_main_delegate_android.h"  // IWYU pragma: export
+#include <chrome/app/android/chrome_main_delegate_android.h>  // IWYU pragma: export
 #undef ChromeMainDelegate

 #endif  // BRAVE_CHROMIUM_SRC_CHROME_APP_ANDROID_CHROME_MAIN_DELEGATE_ANDROID_H_
@@ -6,7 +6,8 @@
 #ifndef BRAVE_CHROMIUM_SRC_CHROME_APP_CHROME_COMMAND_IDS_H_
 #define BRAVE_CHROMIUM_SRC_CHROME_APP_CHROME_COMMAND_IDS_H_

+#include <chrome/app/chrome_command_ids.h>  // IWYU pragma: export
+
 #include "brave/app/brave_command_ids.h"
-#include "src/chrome/app/chrome_command_ids.h"  // IWYU pragma: export

 #endif  // BRAVE_CHROMIUM_SRC_CHROME_APP_CHROME_COMMAND_IDS_H_
@@ -6,5 +6,5 @@
 #include "brave/app/brave_main_delegate.h"

 #define ChromeMainDelegate BraveMainDelegate
-#include "src/chrome/app/chrome_main.cc"
+#include <chrome/app/chrome_main.cc>
 #undef ChromeMainDelegate
@@ -3,6 +3,6 @@
 * 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/. */

-#include "src/chrome/app/chrome_main_delegate.cc"  // IWYU pragma: export
-
 #include "brave/app/brave_main_delegate.cc"  // IWYU pragma: export
+
+#include <chrome/app/chrome_main_delegate.cc>  // IWYU pragma: export
@@ -10,7 +10,7 @@
 #include "chrome/common/chrome_content_client.h"

 #define ChromeContentClient BraveContentClient
-#include "src/chrome/app/chrome_main_delegate.h"  // IWYU pragma: export
+#include <chrome/app/chrome_main_delegate.h>  // IWYU pragma: export
 #undef ChromeContentClient

 #endif  // BRAVE_CHROMIUM_SRC_CHROME_APP_CHROME_MAIN_DELEGATE_H_
@@ -8,4 +8,4 @@
 #include "chrome/common/channel_info.h"
 #include "components/autofill/core/browser/studies/autofill_experiments.h"

-#include "src/chrome/browser/about_flags.cc"
+#include <chrome/browser/about_flags.cc>
@@ -10,5 +10,5 @@
    remove_mask |= chrome_browsing_data_remover::DATA_TYPE_BRAVE_LEO_HISTORY; \
    break;

-#include "src/chrome/browser/android/browsing_data/browsing_data_bridge.cc"
+#include <chrome/browser/android/browsing_data/browsing_data_bridge.cc>
 #undef BRAVE_CLEAR_BROWSING_DATA
@@ -8,5 +8,5 @@
 #include "components/omnibox/browser/autocomplete_controller.h"

 #define ChromeAutocompleteSchemeClassifier BraveAutocompleteSchemeClassifier
-#include "src/chrome/browser/android/omnibox/autocomplete_controller_android.cc"
+#include <chrome/browser/android/omnibox/autocomplete_controller_android.cc>
 #undef ChromeAutocompleteSchemeClassifier
@@ -9,7 +9,7 @@

 #define JNI_AboutSettingsBridge_GetApplicationVersion \
  JNI_AboutSettingsBridge_GetApplicationVersion_ChromiumImpl
-#include "src/chrome/browser/android/preferences/about_settings_bridge.cc"
+#include <chrome/browser/android/preferences/about_settings_bridge.cc>
 #undef JNI_AboutSettingsBridge_GetApplicationVersion

 static std::string JNI_AboutSettingsBridge_GetApplicationVersion(JNIEnv* env) {
@@ -7,6 +7,6 @@

 #define TabFeatures TabFeatures_Chromium

-#include "src/chrome/browser/android/tab_features.cc"
+#include <chrome/browser/android/tab_features.cc>

 #undef TabFeatures
@@ -8,7 +8,7 @@

 #define TabFeatures TabFeatures_Chromium

-#include "src/chrome/browser/android/tab_features.h"  // IWYU pragma: export
+#include <chrome/browser/android/tab_features.h>  // IWYU pragma: export

 #undef TabFeatures

@@ -7,4 +7,4 @@

 #import "brave/browser/brave_app_controller_mac.h"

-#include "src/chrome/browser/app_controller_mac.mm"
+#include <chrome/browser/app_controller_mac.mm>
@@ -8,5 +8,5 @@
 #include "components/omnibox/browser/autocomplete_controller.h"

 #define ChromeAutocompleteSchemeClassifier BraveAutocompleteSchemeClassifier
-#include "src/chrome/browser/autocomplete/autocomplete_classifier_factory.cc"
+#include <chrome/browser/autocomplete/autocomplete_classifier_factory.cc>
 #undef ChromeAutocompleteSchemeClassifier
@@ -3,8 +3,6 @@
 // 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/.

-#include "src/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc"
-
 #include "base/check.h"
 #include "base/strings/utf_string_conversions.h"
 #include "brave/browser/ai_chat/ai_chat_service_factory.h"
@@ -36,6 +34,8 @@
 #include "brave/components/commander/browser/commander_frontend_delegate.h"
 #endif  // BUILDFLAG(ENABLE_COMMANDER)

+#include <chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc>
+
 #if BUILDFLAG(ENABLE_COMMANDER)
 commander::CommanderFrontendDelegate*
 ChromeAutocompleteProviderClient::GetCommanderDelegate() {
@@ -25,7 +25,7 @@
  GetAcceptLanguages() const override; \
  std::u16string GetClipboardText

-#include "src/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h"  // IWYU pragma: export
+#include <chrome/browser/autocomplete/chrome_autocomplete_provider_client.h>  // IWYU pragma: export

 #undef GetAcceptLanguages
 #undef GetInMemoryDatabase
@@ -3,7 +3,7 @@
 * 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/. */

-#include "src/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.cc"
+#include <chrome/browser/bitmap_fetcher/bitmap_fetcher_service.cc>

 BitmapFetcherService::RequestId
 BitmapFetcherService::RequestImageWithNetworkTrafficAnnotationTag(
@@ -12,7 +12,7 @@
      const net::NetworkTrafficAnnotationTag& traffic_annotation); \
  RequestId RequestImage

-#include "src/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h"  // IWYU pragma: export
+#include <chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h>  // IWYU pragma: export
 #undef RequestImage

 #endif  // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_BITMAP_FETCHER_BITMAP_FETCHER_SERVICE_H_
@@ -22,9 +22,10 @@
 #include "chrome/android/chrome_jni_headers/BraveBookmarkBridge_jni.h"
 #undef BraveBookmarkBridge

-#include "src/chrome/browser/bookmarks/android/bookmark_bridge.cc"
 #include "ui/android/window_android.h"

+#include <chrome/browser/bookmarks/android/bookmark_bridge.cc>
+
 using base::android::JavaParamRef;
 using user_data_importer::SearchEngineInfo;

@@ -39,7 +39,7 @@ struct ImportedBookmarkEntry;
      const base::android::JavaParamRef<jstring>& export_file_path);     \
  void SetReadStatus

-#include "src/chrome/browser/bookmarks/android/bookmark_bridge.h"  // IWYU pragma: export
+#include <chrome/browser/bookmarks/android/bookmark_bridge.h>  // IWYU pragma: export
 #undef SetReadStatus

 #endif  // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_BOOKMARKS_ANDROID_BOOKMARK_BRIDGE_H_
@@ -5,7 +5,7 @@

 #define HandleChromeAboutAndChromeSyncRewrite \
  HandleChromeAboutAndChromeSyncRewrite_ChromiumImpl
-#include "src/chrome/browser/browser_about_handler.cc"
+#include <chrome/browser/browser_about_handler.cc>
 #undef HandleChromeAboutAndChromeSyncRewrite

 #include "brave/components/constants/url_constants.h"
@@ -3,10 +3,10 @@
 * 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/. */

-#include "src/chrome/browser/browser_features.cc"
-
 #include "base/feature_override.h"

+#include <chrome/browser/browser_features.cc>
+
 namespace features {

 OVERRIDE_FEATURE_DEFAULT_STATES({{
@@ -9,7 +9,7 @@
 #include "brave/browser/extensions/brave_extensions_browser_client_impl.h"
 #define ChromeExtensionsBrowserClient BraveExtensionsBrowserClientImpl
 #endif
-#include "src/chrome/browser/browser_process_impl.cc"
+#include <chrome/browser/browser_process_impl.cc>
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 #undef ChromeExtensionsBrowserClient
 #endif
@@ -35,7 +35,7 @@
 #define PostDestroyThreads virtual PostDestroyThreads
 #endif  // !BUILDFLAG(IS_ANDROID)

-#include "src/chrome/browser/browser_process_impl.h"  // IWYU pragma: export
+#include <chrome/browser/browser_process_impl.h>  // IWYU pragma: export

 #undef PostDestroyThreads
 #undef StartTearDown
@@ -6,7 +6,7 @@
 #ifndef BRAVE_CHROMIUM_SRC_CHROME_BROWSER_BROWSING_DATA_CHROME_BROWSING_DATA_REMOVER_CONSTANTS_H_
 #define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_BROWSING_DATA_CHROME_BROWSING_DATA_REMOVER_CONSTANTS_H_

-#include "src/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h"  // IWYU pragma: export
+#include <chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h>  // IWYU pragma: export

 namespace chrome_browsing_data_remover {
 constexpr DataType GetBraveDataTypeValue(const int index) {
@@ -10,5 +10,5 @@
  case TracingDataType::kIPFSCache:                              \
    return "IPFSCache";

-#include "src/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc"
+#include <chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc>
 #undef CHROME_BROWSING_DATA_REMOVER_DELEGATE_GET_HISTORY_SUFFIX
@@ -27,7 +27,7 @@ class FalseBoolStub {

 #endif  // !BUILDFLAG(IS_ANDROID)

-#include "src/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h"  // IWYU pragma: export
+#include <chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h>  // IWYU pragma: export

 #if !BUILDFLAG(IS_ANDROID)
 #undef should_clear_sync_account_settings_
@@ -8,5 +8,5 @@
 #include "brave/browser/browsing_data/brave_browsing_data_remover_delegate.h"

 #define ChromeBrowsingDataRemoverDelegate BraveBrowsingDataRemoverDelegate
-#include "src/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.cc"
+#include <chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.cc>
 #undef ChromeBrowsingDataRemoverDelegate
@@ -7,7 +7,7 @@
 #define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_BROWSING_DATA_CHROME_BROWSING_DATA_REMOVER_DELEGATE_FACTORY_H_

 #define ChromeBrowsingDataRemoverDelegate BraveBrowsingDataRemoverDelegate
-#include "src/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.h"  // IWYU pragma: export
+#include <chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.h>  // IWYU pragma: export
 #undef ChromeBrowsingDataRemoverDelegate

 #include "brave/browser/browsing_data/brave_browsing_data_remover_delegate.h"
@@ -45,6 +45,6 @@ int GetBraveShieldsDefaultsCount(base::Time period_start,
  ReportResult(__VA_ARGS__ - GetBraveShieldsDefaultsCount( \
                                 period_start, period_end, map_.get()))

-#include "src/chrome/browser/browsing_data/counters/site_settings_counter.cc"
+#include <chrome/browser/browsing_data/counters/site_settings_counter.cc>

 #undef ReportResult
@@ -7,7 +7,7 @@

 #define ChromeBrowserFieldTrials ChromeBrowserFieldTrialsChromium

-#include "src/chrome/browser/chrome_browser_field_trials.cc"
+#include <chrome/browser/chrome_browser_field_trials.cc>

 #undef ChromeBrowserFieldTrials

@@ -8,7 +8,7 @@

 #define ChromeBrowserFieldTrials ChromeBrowserFieldTrialsChromium

-#include "src/chrome/browser/chrome_browser_field_trials.h"  // IWYU pragma: export
+#include <chrome/browser/chrome_browser_field_trials.h>  // IWYU pragma: export

 #undef ChromeBrowserFieldTrials

@@ -8,6 +8,6 @@

 #define BrowserProcessImpl BraveBrowserProcessImpl
 #define ChromeBrowserMainParts ChromeBrowserMainParts_ChromiumImpl
-#include "src/chrome/browser/chrome_browser_main.cc"
+#include <chrome/browser/chrome_browser_main.cc>
 #undef ChromeBrowserMainParts
 #undef BrowserProcessImpl
@@ -7,7 +7,7 @@
 #define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_CHROME_BROWSER_MAIN_H_

 #define ChromeBrowserMainParts ChromeBrowserMainParts_ChromiumImpl
-#include "src/chrome/browser/chrome_browser_main.h"  // IWYU pragma: export
+#include <chrome/browser/chrome_browser_main.h>  // IWYU pragma: export
 #undef ChromeBrowserMainParts

 class ChromeBrowserMainParts : public ChromeBrowserMainParts_ChromiumImpl {
@@ -8,5 +8,5 @@
 #define BRAVE_CHROME_BROWSER_MAIN_PARTS_MAC_PRE_CREATE_MAIN_MESSAGE_LOOP \
  [[KeystoneGlue defaultKeystoneGlue] registerWithKeystone];

-#include "src/chrome/browser/chrome_browser_main_mac.mm"
+#include <chrome/browser/chrome_browser_main_mac.mm>
 #undef BRAVE_CHROME_BROWSER_MAIN_PARTS_MAC_PRE_CREATE_MAIN_MESSAGE_LOOP
@@ -35,7 +35,7 @@ bool HandleNewTabURLReverseRewrite(GURL* url, content::BrowserContext* bc) {
 }
 }  // namespace search

-#include "src/chrome/browser/chrome_content_browser_client.cc"
+#include <chrome/browser/chrome_content_browser_client.cc>
 #undef HandleNewTabURLRewrite
 #undef HandleNewTabURLReverseRewrite
 #if !BUILDFLAG(ENABLE_EXTENSIONS)
@@ -4,7 +4,7 @@
 * You can obtain one at http://mozilla.org/MPL/2.0/. */

 #define LoadLocalState LoadLocalState_ChromiumImpl
-#include "src/chrome/browser/chrome_resource_bundle_helper.cc"
+#include <chrome/browser/chrome_resource_bundle_helper.cc>
 #undef LoadLocalState
 #include "brave/common/resource_bundle_helper.h"

@@ -9,7 +9,7 @@

 #define MakeChromeComponentUpdaterConfigurator \
    MakeChromeComponentUpdaterConfigurator_ChromiumImpl
-#include "src/chrome/browser/component_updater/chrome_component_updater_configurator.cc"
+#include <chrome/browser/component_updater/chrome_component_updater_configurator.cc>
 #undef MakeChromeComponentUpdaterConfigurator

 namespace component_updater {
@@ -6,7 +6,7 @@
 #include "brave/components/brave_component_updater/browser/brave_on_demand_updater.h"

 #define RegisterCRLSetComponent RegisterCRLSetComponent_ChromiumImpl
-#include "src/chrome/browser/component_updater/crl_set_component_installer.cc"
+#include <chrome/browser/component_updater/crl_set_component_installer.cc>
 #undef RegisterCRLSetComponent

 #include "chrome/browser/browser_process.h"
@@ -7,7 +7,7 @@

 #define RegisterFileTypePoliciesComponent \
  RegisterFileTypePoliciesComponent_ChromiumImpl
-#include "src/chrome/browser/component_updater/file_type_policies_component_installer.cc"
+#include <chrome/browser/component_updater/file_type_policies_component_installer.cc>
 #undef RegisterFileTypePoliciesComponent

 #include "chrome/browser/component_updater/component_updater_utils.h"
@@ -3,7 +3,7 @@
 * 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/. */

-#include "src/chrome/browser/component_updater/pki_metadata_component_installer_unittest.cc"
+#include <chrome/browser/component_updater/pki_metadata_component_installer_unittest.cc>

 namespace component_updater {

@@ -8,7 +8,7 @@

 #define RegisterComponentsForUpdate RegisterComponentsForUpdate_ChromiumImpl

-#include "src/chrome/browser/component_updater/registration.cc"
+#include <chrome/browser/component_updater/registration.cc>

 #undef RegisterComponentsForUpdate

@@ -8,7 +8,7 @@
 #define RegisterTrustTokenKeyCommitmentsComponentIfTrustTokensEnabled \
  RegisterTrustTokenKeyCommitmentsComponentIfTrustTokensEnabled_ChromiumImpl

-#include "src/chrome/browser/component_updater/trust_token_key_commitments_component_installer.cc"
+#include <chrome/browser/component_updater/trust_token_key_commitments_component_installer.cc>
 #undef RegisterTrustTokenKeyCommitmentsComponentIfTrustTokensEnabled

 namespace component_updater {
@@ -8,7 +8,7 @@
 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h"

 #define RegisterWidevineCdmComponent RegisterWidevineCdmComponent_ChromiumImpl
-#include "src/chrome/browser/component_updater/widevine_cdm_component_installer.cc"
+#include <chrome/browser/component_updater/widevine_cdm_component_installer.cc>
 #undef RegisterWidevineCdmComponent

 #include "brave/browser/widevine/widevine_utils.h"
@@ -12,7 +12,7 @@
  RegisterWidevineCdmComponent(           \
      cus, base::OnceCallback<void()> callback = base::DoNothing())

-#include "src/chrome/browser/component_updater/widevine_cdm_component_installer.h"  // IWYU pragma: export
+#include <chrome/browser/component_updater/widevine_cdm_component_installer.h>  // IWYU pragma: export

 #undef RegisterWidevineCdmComponent

@@ -3,13 +3,13 @@
 * 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/. */

-#include "src/chrome/browser/content_settings/content_settings_manager_delegate.cc"
-
 #include "brave/components/brave_shields/core/browser/brave_shields_utils.h"
 #include "brave/components/brave_shields/core/common/shields_settings.mojom-shared.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "components/user_prefs/user_prefs.h"

+#include <chrome/browser/content_settings/content_settings_manager_delegate.cc>
+
 namespace {

 brave_shields::mojom::ShieldsSettingsPtr GetBraveShieldsSettingsOnUI(
@@ -15,7 +15,7 @@
      content_settings::mojom::ContentSettingsManager::       \
          GetBraveShieldsSettingsCallback callback)

-#include "src/chrome/browser/content_settings/content_settings_manager_delegate.h"  // IWYU pragma: export
+#include <chrome/browser/content_settings/content_settings_manager_delegate.h>  // IWYU pragma: export

 #undef GetCookieSettings

@@ -18,7 +18,7 @@

 #define BuildServiceInstanceFor BuildServiceInstanceFor_ChromiumImpl

-#include "src/chrome/browser/content_settings/host_content_settings_map_factory.cc"
+#include <chrome/browser/content_settings/host_content_settings_map_factory.cc>

 #undef BuildServiceInstanceFor

@@ -13,7 +13,7 @@
  BuildServiceInstanceFor_ChromiumImpl(__VA_ARGS__) const; \
  scoped_refptr<RefcountedKeyedService> BuildServiceInstanceFor(__VA_ARGS__)

-#include "src/chrome/browser/content_settings/host_content_settings_map_factory.h"  // IWYU pragma: export
+#include <chrome/browser/content_settings/host_content_settings_map_factory.h>  // IWYU pragma: export

 #undef BuildServiceInstanceFor

@@ -13,6 +13,6 @@
      content_settings::ContentSettingToValue(CONTENT_SETTING_ALLOW),         \
      content_settings::ProviderType::kNone, incognito));

-#include "src/chrome/browser/content_settings/page_specific_content_settings_delegate.cc"
+#include <chrome/browser/content_settings/page_specific_content_settings_delegate.cc>

 #undef BRAVE_GET_GUEST_VIEW_DEFAULT_CONTENT_SETTING_RULES
@@ -3,7 +3,7 @@
 * 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/. */

-#include "src/chrome/browser/devtools/aida_client_unittest.cc"
+#include <chrome/browser/devtools/aida_client_unittest.cc>

 TEST_F(AidaClientTest, NotAvailable) {
  auto availability = AidaClient::CanUseAida(profile_.get());
@@ -10,7 +10,7 @@
  HatsNextWebDialogBrowserTest;      \
  friend class TorProfileManagerUnitTest

-#include "src/chrome/browser/devtools/devtools_window.h"  // IWYU pragma: export
+#include <chrome/browser/devtools/devtools_window.h>  // IWYU pragma: export

 #undef HatsNextWebDialogBrowserTest

@@ -3,10 +3,10 @@
 * 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/. */

-#include "src/chrome/browser/devtools/features.cc"
-
 #include "base/feature_override.h"

+#include <chrome/browser/devtools/features.cc>
+
 namespace features {
 OVERRIDE_FEATURE_DEFAULT_STATES({{
 #if !BUILDFLAG(IS_ANDROID)
@@ -24,5 +24,5 @@ bool DummyMimeUtilUsage() {

 #define Java_MimeUtils_canAutoOpenMimeType \
  Java_BraveMimeUtils_canAutoOpenMimeType
-#include "src/chrome/browser/download/android/download_utils.cc"
+#include <chrome/browser/download/android/download_utils.cc>
 #undef Java_MimeUtils_canAutoOpenMimeType
@@ -71,6 +71,6 @@ std::unique_ptr<BackgroundDownloadService> BuildInMemoryDownloadServiceOverride(

 #define BuildDownloadService BuildDownloadServiceOverride
 #define BuildInMemoryDownloadService BuildInMemoryDownloadServiceOverride
-#include "src/chrome/browser/download/background_download_service_factory.cc"
+#include <chrome/browser/download/background_download_service_factory.cc>
 #undef BuildInMemoryDownloadService
 #undef BuildDownloadService
@@ -9,7 +9,7 @@

 #define ProcessDownloadButtonPress ProcessDownloadButtonPress_ChromiumImpl

-#include "src/chrome/browser/download/bubble/download_bubble_ui_controller.cc"
+#include <chrome/browser/download/bubble/download_bubble_ui_controller.cc>

 #undef ProcessDownloadButtonPress

@@ -12,7 +12,7 @@
  ProcessDownloadButtonPress_ChromiumImpl(__VA_ARGS__); \
  void ProcessDownloadButtonPress(__VA_ARGS__)

-#include "src/chrome/browser/download/bubble/download_bubble_ui_controller.h"  // IWYU pragma: export
+#include <chrome/browser/download/bubble/download_bubble_ui_controller.h>  // IWYU pragma: export

 #undef ProcessDownloadButtonPress

@@ -11,7 +11,7 @@
 #include "chrome/browser/download/bubble/download_bubble_display_info.h"
 #include "chrome/browser/ui/web_applications/app_browser_controller.h"

-#include "src/chrome/browser/download/bubble/download_display_controller.cc"
+#include <chrome/browser/download/bubble/download_display_controller.cc>

 #undef DownloadDisplayController

@@ -17,7 +17,7 @@

 #define UpdateToolbarButtonState virtual UpdateToolbarButtonState

-#include "src/chrome/browser/download/bubble/download_display_controller.h"  // IWYU pragma: export
+#include <chrome/browser/download/bubble/download_display_controller.h>  // IWYU pragma: export

 #undef UpdateToolbarButtonState
 #undef DownloadDisplayControllerTest
@@ -26,7 +26,7 @@
  DELETE_LOCAL_FILE = 24,                                                      \
  OPEN_WITH_MEDIA_APP

-#include "src/chrome/browser/download/download_commands.h"  // IWYU pragma: export
+#include <chrome/browser/download/download_commands.h>  // IWYU pragma: export

 #undef OPEN_WITH_MEDIA_APP
 #undef ExecuteCommand
@@ -45,6 +45,6 @@ std::u16string GetTitle(content::RenderFrameHost* render_frame_host,
             file_types, file_type_index, default_extension, owning_window,  \
             caller)

-#include "src/chrome/browser/download/download_file_picker.cc"
+#include <chrome/browser/download/download_file_picker.cc>

 #undef SelectFile
@@ -14,7 +14,7 @@
  case DownloadCommands::REMOVE_FROM_LIST: \
  case DownloadCommands::DELETE_LOCAL_FILE

-#include "src/chrome/browser/download/download_item_model.cc"
+#include <chrome/browser/download/download_item_model.cc>

 #undef EDIT_WITH_MEDIA_APP

@@ -13,7 +13,7 @@
  SetOpenWhenComplete(__VA_ARGS__) override; \
  void DeleteLocalFile()

-#include "src/chrome/browser/download/download_item_model.h"  // IWYU pragma: export
+#include <chrome/browser/download/download_item_model.h>  // IWYU pragma: export

 #undef SetOpenWhenComplete

@@ -17,7 +17,7 @@
  case DownloadCommands::REMOVE_FROM_LIST: \
  case DownloadCommands::DELETE_LOCAL_FILE

-#include "src/chrome/browser/download/download_shelf_context_menu.cc"
+#include <chrome/browser/download/download_shelf_context_menu.cc>

 #undef EDIT_WITH_MEDIA_APP
 #undef RecordCommandsEnabled
@@ -17,7 +17,7 @@
  }                  \
  virtual ui::SimpleMenuModel* GetMenuModel

-#include "src/chrome/browser/download/download_shelf_context_menu.h"  // IWYU pragma: export
+#include <chrome/browser/download/download_shelf_context_menu.h>  // IWYU pragma: export

 #undef GetMenuModel
 #undef RecordCommandsEnabled
@@ -12,6 +12,6 @@
  case DownloadCommands::REMOVE_FROM_LIST: \
  case DownloadCommands::DELETE_LOCAL_FILE

-#include "src/chrome/browser/download/download_stats.cc"
+#include <chrome/browser/download/download_stats.cc>

 #undef EDIT_WITH_MEDIA_APP
@@ -17,6 +17,6 @@
    return DownloadFileType::NOT_DANGEROUS;                \
  }

-#include "src/chrome/browser/download/download_target_determiner.cc"
+#include <chrome/browser/download/download_target_determiner.cc>
 #undef BRAVE_DOWNLOAD_TARGET_DETERMINER_GET_DANGER_LEVEL
 #undef BRAVE_DOWNLOAD_TARGET_DETERMINER_GET_DANGER_LEVEL2
@@ -14,5 +14,5 @@
  profile_->GetPrefs()->GetBoolean(prefs::kPromptForDownload)); \
  DCHECK_EQ(true

-#include "src/chrome/browser/download/download_ui_controller.cc"
+#include <chrome/browser/download/download_ui_controller.cc>
 #undef kPromptForDownload
@@ -12,6 +12,6 @@
  case DownloadCommands::REMOVE_FROM_LIST: \
  case DownloadCommands::DELETE_LOCAL_FILE

-#include "src/chrome/browser/download/download_ui_model.cc"
+#include <chrome/browser/download/download_ui_model.cc>

 #undef EDIT_WITH_MEDIA_APP
@@ -12,7 +12,7 @@
  virtual void DeleteLocalFile() {}    \
  virtual void OpenUsingPlatformHandler(__VA_ARGS__)

-#include "src/chrome/browser/download/download_ui_model.h"  // IWYU pragma: export
+#include <chrome/browser/download/download_ui_model.h>  // IWYU pragma: export

 #undef OpenUsingPlatformHandler

@@ -12,6 +12,6 @@
  case DownloadCommands::REMOVE_FROM_LIST: \
  case DownloadCommands::DELETE_LOCAL_FILE

-#include "src/chrome/browser/download/offline_item_model.cc"
+#include <chrome/browser/download/offline_item_model.cc>

 #undef EDIT_WITH_MEDIA_APP
@@ -9,6 +9,6 @@
  ECDSA_SHA256:      \
  case crypto::SignatureVerifier::ECDSA_SHA384

-#include "src/chrome/browser/enterprise/connectors/device_trust/key_management/browser/metrics_utils.cc"
+#include <chrome/browser/enterprise/connectors/device_trust/key_management/browser/metrics_utils.cc>
 #undef ECDSA_SHA256

@@ -9,5 +9,5 @@
  ECDSA_SHA256:      \
  case crypto::SignatureVerifier::ECDSA_SHA384

-#include "src/chrome/browser/enterprise/connectors/device_trust/key_management/core/network/key_upload_request.cc"
+#include <chrome/browser/enterprise/connectors/device_trust/key_management/core/network/key_upload_request.cc>
 #undef ECDSA_SHA256
@@ -17,7 +17,7 @@
 #define OnOffTheRecordProfileCreated(...) \
  OnOffTheRecordProfileCreated_ChromiumImpl(__VA_ARGS__)

-#include "src/chrome/browser/extensions/api/cookies/cookies_api.cc"
+#include <chrome/browser/extensions/api/cookies/cookies_api.cc>

 #undef IsSerializeable
 #undef OnOffTheRecordProfileCreated
@@ -22,7 +22,7 @@
  GetFactoryInstance(__VA_ARGS__); \
  friend struct OnCookieChangeExposeForTesting

-#include "src/chrome/browser/extensions/api/cookies/cookies_api.h"  // IWYU pragma: export
+#include <chrome/browser/extensions/api/cookies/cookies_api.h>  // IWYU pragma: export

 namespace extensions {
 struct OnCookieChangeExposeForTesting {
@@ -7,5 +7,5 @@

 #define BRAVE_CREATE_EXTENSION_INFO_HELPER \
  info.is_split_mode = IncognitoInfo::IsSplitMode(&extension);
-#include "src/chrome/browser/extensions/api/developer_private/extension_info_generator.cc"
+#include <chrome/browser/extensions/api/developer_private/extension_info_generator.cc>
 #undef BRAVE_CREATE_EXTENSION_INFO_HELPER
@@ -66,7 +66,7 @@
    }                                                                          \
  }                                                                            \
  IdentityTokenCacheValue::CacheValueStatus
-#include "src/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc"
+#include <chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc>
 #undef CacheValueStatus
 #undef BRAVE_START_MINT_TOKEN_FLOW_ELSE
 #undef BRAVE_START_MINT_TOKEN_FLOW_IF
@@ -10,7 +10,7 @@
 #include "extensions/browser/extension_function.h"

 #define ExtensionFunction ExtensionFunction, public BraveWebAuthFlow
-#include "src/chrome/browser/extensions/api/identity/identity_get_auth_token_function.h"  // IWYU pragma: export
+#include <chrome/browser/extensions/api/identity/identity_get_auth_token_function.h>  // IWYU pragma: export
 #undef ExtensionFunction

 #endif  // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_EXTENSIONS_API_IDENTITY_IDENTITY_GET_AUTH_TOKEN_FUNCTION_H_
@@ -10,7 +10,7 @@
  Dummy();                 \
  virtual const TypedPrefMap& GetAllowlistedKeys

-#include "src/chrome/browser/extensions/api/settings_private/prefs_util.h"  // IWYU pragma: export
+#include <chrome/browser/extensions/api/settings_private/prefs_util.h>  // IWYU pragma: export
 #undef GetAllowlistedKeys

 #endif  // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_EXTENSIONS_API_SETTINGS_PRIVATE_PREFS_UTIL_H_
@@ -6,5 +6,5 @@
 #include "brave/browser/extensions/api/settings_private/brave_prefs_util.h"

 #define PrefsUtil BravePrefsUtil
-#include "src/chrome/browser/extensions/api/settings_private/settings_private_delegate.cc"
+#include <chrome/browser/extensions/api/settings_private/settings_private_delegate.cc>
 #undef PrefsUtil
@@ -6,5 +6,5 @@
 #include "brave/browser/extensions/api/settings_private/brave_prefs_util.h"

 #define PrefsUtil BravePrefsUtil
-#include "src/chrome/browser/extensions/api/settings_private/settings_private_event_router.cc"
+#include <chrome/browser/extensions/api/settings_private/settings_private_event_router.cc>
 #undef PrefsUtil
@@ -8,5 +8,5 @@
 #define BRAVE_DISABLE_RPH_FROM_REQUEST \
    *error = "Unsupported"; return nullptr;

-#include "src/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc"
+#include <chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc>
 #undef BRAVE_DISABLE_RPH_FROM_REQUEST
@@ -12,5 +12,5 @@
  AddComponentResourceEntries(kBraveExtension);                     \
  AddComponentResourceEntries(kBraveExtensionGenerated);

-#include "src/chrome/browser/extensions/chrome_component_extension_resource_manager.cc"
+#include <chrome/browser/extensions/chrome_component_extension_resource_manager.cc>
 #undef BRAVE_CHROME_COMPONENT_EXTENSION_RESOURCE_MANAGER_DATA_DATA
--- a/Show More
+++ b/Show More