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

Fix BraveBrowsingDataRemoverDelegate substitution #21034

Merged
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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_

This file was deleted.

2 changes: 0 additions & 2 deletions chromium_src/chrome/browser/profiles/profile_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 0 additions & 2 deletions chromium_src/chrome/test/base/testing_profile.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"