diff --git a/chromium_src/chrome/browser/bookmarks/bookmark_model_factory.cc b/chromium_src/chrome/browser/bookmarks/bookmark_model_factory.cc deleted file mode 100644 index b578b2f4e284..000000000000 --- a/chromium_src/chrome/browser/bookmarks/bookmark_model_factory.cc +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2019 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/. */ - -#include "brave/browser/profiles/profile_util.h" - -#include "src/chrome/browser/bookmarks/bookmark_model_factory.cc" - -content::BrowserContext* BookmarkModelFactory::GetBrowserContextToUse( - content::BrowserContext* context) const { - // To make different service for normal and incognito profile. - return chrome::GetBrowserContextRedirectedInIncognitoOverride(context); -} diff --git a/chromium_src/chrome/browser/bookmarks/bookmark_model_factory.h b/chromium_src/chrome/browser/bookmarks/bookmark_model_factory.h deleted file mode 100644 index 5a27bb85e1dd..000000000000 --- a/chromium_src/chrome/browser/bookmarks/bookmark_model_factory.h +++ /dev/null @@ -1,21 +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/. */ - -#ifndef BRAVE_CHROMIUM_SRC_CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_FACTORY_H_ -#define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_FACTORY_H_ - -#include "chrome/browser/profiles/profile_keyed_service_factory.h" - -#define ServiceIsNULLWhileTesting \ - ServiceIsNULLWhileTesting_unused(); \ - content::BrowserContext* GetBrowserContextToUse( \ - content::BrowserContext* context) const override; \ - bool ServiceIsNULLWhileTesting - -#include "src/chrome/browser/bookmarks/bookmark_model_factory.h" - -#undef ServiceIsNULLWhileTesting - -#endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_FACTORY_H_ diff --git a/chromium_src/chrome/browser/bookmarks/managed_bookmark_service_factory.cc b/chromium_src/chrome/browser/bookmarks/managed_bookmark_service_factory.cc deleted file mode 100644 index bc2ef52f99dc..000000000000 --- a/chromium_src/chrome/browser/bookmarks/managed_bookmark_service_factory.cc +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2019 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/. */ - -#include "brave/browser/profiles/profile_util.h" - -#include "src/chrome/browser/bookmarks/managed_bookmark_service_factory.cc" - -content::BrowserContext* ManagedBookmarkServiceFactory::GetBrowserContextToUse( - content::BrowserContext* context) const { - // To make different service for normal and incognito profile. - return chrome::GetBrowserContextRedirectedInIncognitoOverride(context); -} diff --git a/chromium_src/chrome/browser/bookmarks/managed_bookmark_service_factory.h b/chromium_src/chrome/browser/bookmarks/managed_bookmark_service_factory.h deleted file mode 100644 index ba3a6e5e6fa0..000000000000 --- a/chromium_src/chrome/browser/bookmarks/managed_bookmark_service_factory.h +++ /dev/null @@ -1,21 +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/. */ - -#ifndef BRAVE_CHROMIUM_SRC_CHROME_BROWSER_BOOKMARKS_MANAGED_BOOKMARK_SERVICE_FACTORY_H_ -#define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_BOOKMARKS_MANAGED_BOOKMARK_SERVICE_FACTORY_H_ - -#include "chrome/browser/profiles/profile_keyed_service_factory.h" - -#define ServiceIsNULLWhileTesting \ - ServiceIsNULLWhileTesting_unused(); \ - content::BrowserContext* GetBrowserContextToUse( \ - content::BrowserContext* context) const override; \ - bool ServiceIsNULLWhileTesting - -#include "src/chrome/browser/bookmarks/managed_bookmark_service_factory.h" - -#undef ServiceIsNULLWhileTesting - -#endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_BOOKMARKS_MANAGED_BOOKMARK_SERVICE_FACTORY_H_ diff --git a/test/filters/browser_tests.filter b/test/filters/browser_tests.filter index f08dbfcff2f0..7dde35462cf7 100644 --- a/test/filters/browser_tests.filter +++ b/test/filters/browser_tests.filter @@ -134,10 +134,6 @@ # language fingerprinting, regardless of the feature flag state -DisableFeatureReduceAcceptLanguageBrowserTest.NoAcceptLanguageHeader -# These tests fail because BookmarkUndoService::Start fails a DCHECK due to its -# this pointer being null --IdleServiceTest.* - # These tests fail because the primary account consent level is null instead of # signin::ConsentLevel::kSignin -TurnSyncOnHelperBrowserTest.PrimaryAccountResetAfterSyncOptInFlowAborted/*