From 0a0de9a1ea7fbfef7e374ba93dac1d5596f22606 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Sat, 18 Nov 2023 08:30:19 +0000 Subject: [PATCH] Fix `BraveBrowsingDataRemoverDelegate` substitution This override has been missing a matching header since it was introduced, and this has been causing linking to fail in every upstream occurrence of `ChromeBrowsingDataRemoverDelegateFactory::GetForProfile` as the return type in the header was not being replaced accordingly. This changes adds the changes to the header as well, and provides an inclusion `BraveBrowsingDataRemoverDelegate` in the shadow file, to allow the compiler to understand that `BraveBrowsingDataRemoverDelegate*` is pefectly convertible to `ChromeBrowsingDataRemoverDelegate`. --- ...rome_browsing_data_remover_delegate_factory.cc | 2 ++ ...hrome_browsing_data_remover_delegate_factory.h | 15 +++++++++++++++ .../profiles/off_the_record_profile_impl.cc | 8 -------- .../chrome/browser/profiles/profile_impl.cc | 2 -- chromium_src/chrome/test/base/testing_profile.cc | 2 -- 5 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.h delete mode 100644 chromium_src/chrome/browser/profiles/off_the_record_profile_impl.cc diff --git a/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.cc b/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.cc index 6609954ff4c0..2dd21e854f97 100644 --- a/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.cc +++ b/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.cc @@ -3,6 +3,8 @@ * 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 "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.h" + #include "brave/browser/browsing_data/brave_browsing_data_remover_delegate.h" #define ChromeBrowsingDataRemoverDelegate BraveBrowsingDataRemoverDelegate diff --git a/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.h b/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.h new file mode 100644 index 000000000000..859215b4b7e7 --- /dev/null +++ b/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.h @@ -0,0 +1,15 @@ +/* Copyright (c) 2021 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/. */ + +#ifndef BRAVE_CHROMIUM_SRC_CHROME_BROWSER_BROWSING_DATA_CHROME_BROWSING_DATA_REMOVER_DELEGATE_FACTORY_H_ +#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 +#undef ChromeBrowsingDataRemoverDelegate + +#include "brave/browser/browsing_data/brave_browsing_data_remover_delegate.h" + +#endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_BROWSING_DATA_CHROME_BROWSING_DATA_REMOVER_DELEGATE_FACTORY_H_ diff --git a/chromium_src/chrome/browser/profiles/off_the_record_profile_impl.cc b/chromium_src/chrome/browser/profiles/off_the_record_profile_impl.cc deleted file mode 100644 index 5d8a3e549d6d..000000000000 --- a/chromium_src/chrome/browser/profiles/off_the_record_profile_impl.cc +++ /dev/null @@ -1,8 +0,0 @@ -/* Copyright (c) 2022 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/. */ - -#define ChromeBrowsingDataRemoverDelegate BraveBrowsingDataRemoverDelegate -#include "src/chrome/browser/profiles/off_the_record_profile_impl.cc" -#undef ChromeBrowsingDataRemoverDelegate diff --git a/chromium_src/chrome/browser/profiles/profile_impl.cc b/chromium_src/chrome/browser/profiles/profile_impl.cc index 894719350e51..f22a662433f9 100644 --- a/chromium_src/chrome/browser/profiles/profile_impl.cc +++ b/chromium_src/chrome/browser/profiles/profile_impl.cc @@ -7,14 +7,12 @@ #include "brave/browser/brave_browser_features.h" -#define ChromeBrowsingDataRemoverDelegate BraveBrowsingDataRemoverDelegate #define ShouldRestoreOldSessionCookies \ ShouldRestoreOldSessionCookies_ChromiumImpl #include "src/chrome/browser/profiles/profile_impl.cc" #undef ShouldRestoreOldSessionCookies -#undef ChromeBrowsingDataRemoverDelegate bool ProfileImpl::ShouldRestoreOldSessionCookies() { bool should_restore = ShouldRestoreOldSessionCookies_ChromiumImpl(); diff --git a/chromium_src/chrome/test/base/testing_profile.cc b/chromium_src/chrome/test/base/testing_profile.cc index a60822c5bc62..3dc6a2e6cf5a 100644 --- a/chromium_src/chrome/test/base/testing_profile.cc +++ b/chromium_src/chrome/test/base/testing_profile.cc @@ -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 http://mozilla.org/MPL/2.0/. */ -#define ChromeBrowsingDataRemoverDelegate BraveBrowsingDataRemoverDelegate #include "src/chrome/test/base/testing_profile.cc" -#undef ChromeBrowsingDataRemoverDelegate #include "brave/test/base/brave_testing_profile.cc"