Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove chrome-browser-browsing_data-chrome_browsing_data_remover_delegate_factory.cc.patch #8293

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions chromium_src/chrome/browser/DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
@@ -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_

This file was deleted.