From 5c589085649b970e3e6ac184d79d3c7f06ab6bd3 Mon Sep 17 00:00:00 2001 From: Jocelyn Liu Date: Wed, 10 Feb 2021 22:46:25 -0800 Subject: [PATCH] Remove redundant BRAVE_INIT patch in chrome/test/base/testing_profile.cc The original code block is no longer run on desktop platforms. --- chromium_src/chrome/test/base/testing_profile.cc | 14 -------------- patches/chrome-test-base-testing_profile.cc.patch | 12 ------------ 2 files changed, 26 deletions(-) delete mode 100644 chromium_src/chrome/test/base/testing_profile.cc delete mode 100644 patches/chrome-test-base-testing_profile.cc.patch diff --git a/chromium_src/chrome/test/base/testing_profile.cc b/chromium_src/chrome/test/base/testing_profile.cc deleted file mode 100644 index 4b4f30f19c74..000000000000 --- a/chromium_src/chrome/test/base/testing_profile.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" - -#define BRAVE_INIT \ - if (brave::IsSessionProfilePath(GetPath())) \ - brave::CreateParentProfileData(this); \ - else - -#include "../../../../../chrome/test/base/testing_profile.cc" -#undef BRAVE_INIT diff --git a/patches/chrome-test-base-testing_profile.cc.patch b/patches/chrome-test-base-testing_profile.cc.patch deleted file mode 100644 index 7173867b92c1..000000000000 --- a/patches/chrome-test-base-testing_profile.cc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc -index f39a4ca8789b1edd1624bf02db66d38e7aa4726a..bc238faab03a0e90743fc49d03566e68213db5cc 100644 ---- a/chrome/test/base/testing_profile.cc -+++ b/chrome/test/base/testing_profile.cc -@@ -358,6 +358,7 @@ void TestingProfile::Init() { - EnsureBrowserContextKeyedServiceFactoriesBuilt(); - - #if BUILDFLAG(ENABLE_SUPERVISED_USERS) -+ BRAVE_INIT - if (!IsOffTheRecord()) { - SupervisedUserSettingsService* settings_service = - SupervisedUserSettingsServiceFactory::GetForKey(key_.get());