From 1f670e2581f2035cffb743787ef7c523e71a5693 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 18 Mar 2021 19:06:54 +0100 Subject: [PATCH] Remove chrome-browser-browsing_data-chrome_browsing_data_remover_delegate_factory.cc.patch This patch could be removed in favour of a chromium_src override that would define its version of ChromeBrowsingDataRemoverDelegateFactory's BuildServiceInstanceFor() to simply return an instance of BraveBrowsingDataRemoverDelegate(), instead of patching the original method from upstream (which doesn't do anything else other than returning an instance of ChromeBrowsingDataRemoverDelegate). Resolves https://github.com/brave/brave-browser/issues/14819 --- chromium_src/chrome/browser/DEPS | 2 + ..._browsing_data_remover_delegate_factory.cc | 44 +++++++++++++++++++ ...e_browsing_data_remover_delegate_factory.h | 18 ++++++++ ...ing_data_remover_delegate_factory.cc.patch | 11 ----- 4 files changed, 64 insertions(+), 11 deletions(-) create mode 100644 chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.h delete mode 100644 patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate_factory.cc.patch diff --git a/chromium_src/chrome/browser/DEPS b/chromium_src/chrome/browser/DEPS index 459d92a07de3..b19224215194 100644 --- a/chromium_src/chrome/browser/DEPS +++ b/chromium_src/chrome/browser/DEPS @@ -91,6 +91,8 @@ include_rules = [ "+components/autofill/core/browser", "+components/bookmarks/browser", "+components/component_updater", + "+components/feed/buildflags.h", + "+components/feed/feed_feature_list.h", "+components/gcm_driver/gcm_buildflags.h", "+components/grit/brave_components_resources.h", "+components/grit/brave_components_strings.h", 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 88bd931b37e8..82987d115fc7 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,50 @@ * 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/. */ +// Note: BuildServiceInstanceFor is an overriden virtual method, so we need to +// include all the original headers to make sure that we only redefine it here. +#include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.h" +#include "build/build_config.h" +#include "chrome/browser/autofill/personal_data_manager_factory.h" +#include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h" +#include "chrome/browser/content_settings/host_content_settings_map_factory.h" +#include "chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_settings_factory.h" +#include "chrome/browser/domain_reliability/service_factory.h" +#include "chrome/browser/history/history_service_factory.h" +#include "chrome/browser/history/web_history_service_factory.h" +#include "chrome/browser/password_manager/password_store_factory.h" +#include "chrome/browser/prefetch/no_state_prefetch/prerender_manager_factory.h" +#include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search_engines/template_url_service_factory.h" +#include "chrome/browser/sessions/tab_restore_service_factory.h" +#include "chrome/browser/web_data_service_factory.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" +#include "content/public/browser/browser_context.h" +#include "extensions/buildflags/buildflags.h" + +#if BUILDFLAG(ENABLE_EXTENSIONS) +#include "chrome/browser/extensions/activity_log/activity_log.h" +#include "extensions/browser/extension_prefs_factory.h" +#endif + +#if BUILDFLAG(ENABLE_SESSION_SERVICE) +#include "chrome/browser/sessions/session_service_factory.h" +#endif + +#if defined(OS_ANDROID) +#include "chrome/browser/android/feed/feed_host_service_factory.h" +#include "chrome/browser/android/feed/v2/feed_service_factory.h" +#include "components/feed/buildflags.h" +#include "components/feed/feed_feature_list.h" +#endif // defined(OS_ANDROID) + #include "brave/browser/browsing_data/brave_browsing_data_remover_delegate.h" +#define BuildServiceInstanceFor BuildServiceInstanceFor_Unused #include "../../../../../chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.cc" +#undef BuildServiceInstanceFor + +KeyedService* ChromeBrowsingDataRemoverDelegateFactory::BuildServiceInstanceFor( + content::BrowserContext* context) const { + return new BraveBrowsingDataRemoverDelegate(context); +} 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..2bc8472c0988 --- /dev/null +++ b/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.h @@ -0,0 +1,18 @@ +/* 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 http://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_ + +#include "components/keyed_service/content/browser_context_keyed_service_factory.h" + +#define BuildServiceInstanceFor \ + BuildServiceInstanceFor_Unused(content::BrowserContext* context) const; \ + KeyedService* BuildServiceInstanceFor + +#include "../../../../../chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.h" +#undef BuildServiceInstanceFor + +#endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_BROWSING_DATA_CHROME_BROWSING_DATA_REMOVER_DELEGATE_FACTORY_H_ diff --git a/patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate_factory.cc.patch b/patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate_factory.cc.patch deleted file mode 100644 index e5bec587c387..000000000000 --- a/patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate_factory.cc.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.cc -index 821b1f25c7387d8fd7fabd030fd905e9af39f813..8bf5455090728fceeb29f3440708909e1c7fec3f 100644 ---- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.cc -+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.cc -@@ -108,5 +108,5 @@ ChromeBrowsingDataRemoverDelegateFactory::GetBrowserContextToUse( - - KeyedService* ChromeBrowsingDataRemoverDelegateFactory::BuildServiceInstanceFor( - content::BrowserContext* context) const { -- return new ChromeBrowsingDataRemoverDelegate(context); -+ return new BraveBrowsingDataRemoverDelegate(context); - }