From 5d57abcd7cbf90a478960bf860005fce99a3af8e Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Wed, 30 Oct 2024 14:13:35 +0000 Subject: [PATCH] [cr132] Browser `companion` has been deleted The only references to this target were to disable features. Chromium change: https://chromium.googlesource.com/chromium/src/+/1b74bc8246cd7cab6a69466281de9a595b9a37e8 commit 1b74bc8246cd7cab6a69466281de9a595b9a37e8 Author: Juan Mojica Date: Tue Oct 29 20:52:26 2024 +0000 [companion] Remove remaining companion code. Histograms will be removed in a follow-up. This also does not remove chrome/browser/companion/text_finder/ directory as that code is used by some Android browser code. Change-Id: Ia98336080ff47a6edecd73be9c9205c71befba6d Bug: b:348678854 --- app/BUILD.gn | 1 - app/feature_defaults_unittest.cc | 5 ----- .../chrome/browser/companion/core/features.cc | 19 ------------------- 3 files changed, 25 deletions(-) delete mode 100644 chromium_src/chrome/browser/companion/core/features.cc diff --git a/app/BUILD.gn b/app/BUILD.gn index 4ff00e9dd1d..c16c6d2b40b 100644 --- a/app/BUILD.gn +++ b/app/BUILD.gn @@ -174,7 +174,6 @@ source_set("unit_tests") { "//brave/components/commands/common", "//chrome/app:command_ids", "//chrome/browser/apps/link_capturing:features", - "//chrome/browser/companion/core", "//chrome/common:chrome_features", "//components/translate/core/common", "//extensions/common", diff --git a/app/feature_defaults_unittest.cc b/app/feature_defaults_unittest.cc index e08d40324a9..62b3d7aa4da 100644 --- a/app/feature_defaults_unittest.cc +++ b/app/feature_defaults_unittest.cc @@ -9,7 +9,6 @@ #include "base/features.h" #include "base/logging.h" #include "chrome/browser/browser_features.h" -#include "chrome/browser/companion/core/features.h" #include "chrome/browser/devtools/features.h" #include "chrome/browser/preloading/preloading_features.h" #include "chrome/browser/ui/ui_features.h" @@ -126,10 +125,6 @@ TEST(FeatureDefaultsTest, DisabledFeatures) { &content_settings::features::kTrackingProtection3pcd, &content_settings::features::kUserBypassUI, #if !BUILDFLAG(IS_ANDROID) - &companion::features::internal:: - kCompanionEnabledByObservingExpsNavigations, - &companion::features::internal::kSidePanelCompanion, - &companion::features::internal::kSidePanelCompanion2, &enterprise_signals::features::kDeviceSignalsConsentDialog, &extensions_features::kExtensionManifestV2DeprecationWarning, &extensions_features::kExtensionManifestV2Unsupported, diff --git a/chromium_src/chrome/browser/companion/core/features.cc b/chromium_src/chrome/browser/companion/core/features.cc deleted file mode 100644 index 891af243d8e..00000000000 --- a/chromium_src/chrome/browser/companion/core/features.cc +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright (c) 2023 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/. */ - -#include "src/chrome/browser/companion/core/features.cc" - -#include "base/feature_override.h" - -namespace companion::features::internal { - -OVERRIDE_FEATURE_DEFAULT_STATES({{ - {kCompanionEnabledByObservingExpsNavigations, - base::FEATURE_DISABLED_BY_DEFAULT}, - {kSidePanelCompanion, base::FEATURE_DISABLED_BY_DEFAULT}, - {kSidePanelCompanion2, base::FEATURE_DISABLED_BY_DEFAULT}, -}}); - -} // namespace companion::features::internal