Remove search companion WebUI.

Cq-Include-Trybots: luci.chrome.try:linux-chromeos-chrome,mac-chrome
Bug: b:273782868
Change-Id: I55633453fb0fd94db0b9d641cf9c85ca5c7a8383
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4348157
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Reviewed-by: Thomas Lukaszewicz <tluk@chromium.org>
Commit-Queue: Juan Mojica <juanmojica@google.com>
Reviewed-by: Matthew Denton <mpdenton@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1118446}

chrome/browser/BUILD.gn

@@ -4397,7 +4397,6 @@ static_library("browser") {
       "//chrome/browser/ui/webui/side_panel/companion:mojo_bindings",
       "//chrome/browser/ui/webui/side_panel/customize_chrome:mojo_bindings",
       "//chrome/browser/ui/webui/side_panel/reading_list:mojo_bindings",
-      "//chrome/browser/ui/webui/side_panel/search_companion:mojo_bindings",
       "//chrome/browser/ui/webui/side_panel/user_notes:mojo_bindings",
       "//chrome/browser/ui/webui/tab_search:mojo_bindings",
       "//chrome/browser/ui/webui/tab_strip:mojo_bindings",

chrome/browser/chrome_browser_interface_binders.cc

@@ -174,7 +174,6 @@
 #include "chrome/browser/ui/webui/side_panel/read_anything/read_anything_ui.h"
 #include "chrome/browser/ui/webui/side_panel/reading_list/reading_list.mojom.h"
 #include "chrome/browser/ui/webui/side_panel/reading_list/reading_list_ui.h"
-#include "chrome/browser/ui/webui/side_panel/search_companion/search_companion_side_panel_ui.h"
 #include "chrome/browser/ui/webui/side_panel/user_notes/user_notes.mojom.h"
 #include "chrome/browser/ui/webui/side_panel/user_notes/user_notes_side_panel_ui.h"
 #include "chrome/browser/ui/webui/tab_search/tab_search.mojom.h"
@@ -1058,18 +1057,11 @@ void PopulateChromeWebUIFrameBinders(
   RegisterWebUIControllerInterfaceBinder<
       shopping_list::mojom::ShoppingListHandlerFactory, BookmarksSidePanelUI>(
       map);
-
   if (base::FeatureList::IsEnabled(features::kPowerBookmarksSidePanel)) {
     RegisterWebUIControllerInterfaceBinder<
         image_service::mojom::ImageServiceHandler, BookmarksSidePanelUI>(map);
   }
 
-  if (base::FeatureList::IsEnabled(features::kSidePanelSearchCompanion)) {
-    RegisterWebUIControllerInterfaceBinder<
-        side_panel::mojom::SearchCompanionPageHandlerFactory,
-        SearchCompanionSidePanelUI>(map);
-  }
-
   if (customize_chrome::IsSidePanelEnabled()) {
     RegisterWebUIControllerInterfaceBinder<
         side_panel::mojom::CustomizeChromePageHandlerFactory,

chrome/browser/resources/BUILD.gn

@@ -50,7 +50,6 @@ group("resources") {
       "side_panel/history_clusters:resources",
       "side_panel/read_anything:resources",
       "side_panel/reading_list:resources",
-      "side_panel/search_companion:resources",
       "side_panel/shared:resources",
       "side_panel/user_notes:resources",
       "signin:resources",

chrome/browser/ui/BUILD.gn

@@ -1706,10 +1706,6 @@ static_library("ui") {
       "webui/side_panel/reading_list/reading_list_page_handler.h",
       "webui/side_panel/reading_list/reading_list_ui.cc",
       "webui/side_panel/reading_list/reading_list_ui.h",
-      "webui/side_panel/search_companion/search_companion_page_handler.cc",
-      "webui/side_panel/search_companion/search_companion_page_handler.h",
-      "webui/side_panel/search_companion/search_companion_side_panel_ui.cc",
-      "webui/side_panel/search_companion/search_companion_side_panel_ui.h",
       "webui/side_panel/user_notes/user_notes_page_handler.cc",
       "webui/side_panel/user_notes/user_notes_page_handler.h",
       "webui/side_panel/user_notes/user_notes_side_panel_ui.cc",
@@ -1824,7 +1820,6 @@ static_library("ui") {
       "//chrome/browser/ui/webui/side_panel/companion:mojo_bindings",
       "//chrome/browser/ui/webui/side_panel/customize_chrome:mojo_bindings",
       "//chrome/browser/ui/webui/side_panel/reading_list:mojo_bindings",
-      "//chrome/browser/ui/webui/side_panel/search_companion:mojo_bindings",
       "//chrome/browser/ui/webui/side_panel/user_notes:mojo_bindings",
       "//chrome/browser/ui/webui/tab_search:mojo_bindings",
       "//chrome/browser/ui/webui/tab_strip:mojo_bindings",

chrome/browser/ui/browser_element_identifiers.cc

@@ -32,7 +32,6 @@ DEFINE_ELEMENT_IDENTIFIER_VALUE(kPasswordsOmniboxKeyIconElementId);
 DEFINE_ELEMENT_IDENTIFIER_VALUE(kPriceTrackingChipElementId);
 DEFINE_ELEMENT_IDENTIFIER_VALUE(kPriceTrackingBookmarkViewElementId);
 DEFINE_ELEMENT_IDENTIFIER_VALUE(kReadLaterSidePanelWebViewElementId);
-DEFINE_ELEMENT_IDENTIFIER_VALUE(kSearchCompanionSidePanelWebViewElementId);
 DEFINE_ELEMENT_IDENTIFIER_VALUE(kSidePanelButtonElementId);
 DEFINE_ELEMENT_IDENTIFIER_VALUE(kSidePanelElementId);
 DEFINE_ELEMENT_IDENTIFIER_VALUE(kSidePanelCloseButtonElementId);

chrome/browser/ui/browser_element_identifiers.h

@@ -48,7 +48,6 @@ DECLARE_ELEMENT_IDENTIFIER_VALUE(kSidePanelComboboxElementId);
 DECLARE_ELEMENT_IDENTIFIER_VALUE(kSidePanelOpenInNewTabButtonElementId);
 DECLARE_ELEMENT_IDENTIFIER_VALUE(kSidePanelReadingListUnreadElementId);
 DECLARE_ELEMENT_IDENTIFIER_VALUE(kSavePasswordComboboxElementId);
-DECLARE_ELEMENT_IDENTIFIER_VALUE(kSearchCompanionSidePanelWebViewElementId);
 DECLARE_ELEMENT_IDENTIFIER_VALUE(kSideSearchButtonElementId);
 DECLARE_ELEMENT_IDENTIFIER_VALUE(kSideSearchWebViewElementId);
 DECLARE_ELEMENT_IDENTIFIER_VALUE(kTabAlertIndicatorButtonElementId);

chrome/browser/ui/ui_features.cc

@@ -120,9 +120,6 @@ BASE_FEATURE(kSidePanelJourneysQueryless,
              "SidePanelJourneysQueryless",
              base::FEATURE_DISABLED_BY_DEFAULT);
 
-BASE_FEATURE(kSidePanelSearchCompanion,
-             "SidePanelSearchCompanion",
-             base::FEATURE_DISABLED_BY_DEFAULT);
 #if !defined(ANDROID)
 // This differs from the search companion by providing a separate WebUI that
 // contains untrusted content in an iframe.

chrome/browser/ui/views/side_panel/search_companion/search_companion_side_panel_coordinator.cc

@@ -14,7 +14,6 @@
 #include "chrome/browser/ui/views/side_panel/side_panel_registry.h"
 #include "chrome/browser/ui/views/side_panel/side_panel_web_ui_view.h"
 #include "chrome/browser/ui/webui/side_panel/companion/companion_side_panel_untrusted_ui.h"
-#include "chrome/browser/ui/webui/side_panel/search_companion/search_companion_side_panel_ui.h"
 #include "chrome/common/webui_url_constants.h"
 
 SearchCompanionSidePanelCoordinator::SearchCompanionSidePanelCoordinator(
@@ -39,34 +38,22 @@ void SearchCompanionSidePanelCoordinator::
 
 std::unique_ptr<views::View>
 SearchCompanionSidePanelCoordinator::CreateCompanionWebView() {
-  if (base::FeatureList::IsEnabled(features::kSidePanelCompanion)) {
-    auto wrapper =
-        std::make_unique<BubbleContentsWrapperT<CompanionSidePanelUntrustedUI>>(
-            GURL(chrome::kChromeUIUntrustedCompanionSidePanelURL),
-            GetBrowserView()->GetProfile(),
-            /*webui_resizes_host=*/false,
-            /*esc_closes_ui=*/false);
-    auto* raw_wrapper = wrapper.get();
-    auto companion_web_view =
-        std::make_unique<SidePanelWebUIViewT<CompanionSidePanelUntrustedUI>>(
-            base::RepeatingClosure(), base::RepeatingClosure(),
-            std::move(wrapper));
-    // Need to set browser after SidePanelWebUIViewT is constructed since it
-    // creates the WebUIController. The WebUI needs a Browser pointer in order
-    // to observe changes to the tab strip model.
-    raw_wrapper->GetWebUIController()->GetWeakPtr()->set_browser(browser_);
-    return companion_web_view;
-  }
-
-  auto search_companion_web_view =
-      std::make_unique<SidePanelWebUIViewT<SearchCompanionSidePanelUI>>(
+  auto wrapper =
+      std::make_unique<BubbleContentsWrapperT<CompanionSidePanelUntrustedUI>>(
+          GURL(chrome::kChromeUIUntrustedCompanionSidePanelURL),
+          GetBrowserView()->GetProfile(),
+          /*webui_resizes_host=*/false,
+          /*esc_closes_ui=*/false);
+  auto* raw_wrapper = wrapper.get();
+  auto companion_web_view =
+      std::make_unique<SidePanelWebUIViewT<CompanionSidePanelUntrustedUI>>(
           base::RepeatingClosure(), base::RepeatingClosure(),
-          std::make_unique<BubbleContentsWrapperT<SearchCompanionSidePanelUI>>(
-              GURL(chrome::kChromeUISearchCompanionSidePanelURL),
-              GetBrowserView()->GetProfile(),
-              /*webui_resizes_host=*/false,
-              /*esc_closes_ui=*/false));
-  return search_companion_web_view;
+          std::move(wrapper));
+  // Need to set browser after SidePanelWebUIViewT is constructed since it
+  // creates the WebUIController. The WebUI needs a Browser pointer in order
+  // to observe changes to the tab strip model.
+  raw_wrapper->GetWebUIController()->GetWeakPtr()->set_browser(browser_);
+  return companion_web_view;
 }
 
 bool SearchCompanionSidePanelCoordinator::Show() {

chrome/browser/ui/views/side_panel/side_panel_util.cc

@@ -92,8 +92,7 @@ void SidePanelUtil::PopulateGlobalEntries(Browser* browser,
   }
 
   // Create Search Companion coordinator.
-  if (base::FeatureList::IsEnabled(features::kSidePanelSearchCompanion) ||
-      base::FeatureList::IsEnabled(features::kSidePanelCompanion)) {
+  if (base::FeatureList::IsEnabled(features::kSidePanelCompanion)) {
     SearchCompanionSidePanelCoordinator::GetOrCreateForBrowser(browser)
         ->CreateAndRegisterEntriesForExistingWebContents(
             browser->tab_strip_model());

chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

@@ -164,7 +164,6 @@
 #include "chrome/browser/ui/webui/side_panel/history_clusters/history_clusters_side_panel_ui.h"
 #include "chrome/browser/ui/webui/side_panel/read_anything/read_anything_ui.h"
 #include "chrome/browser/ui/webui/side_panel/reading_list/reading_list_ui.h"
-#include "chrome/browser/ui/webui/side_panel/search_companion/search_companion_side_panel_ui.h"
 #include "chrome/browser/ui/webui/side_panel/user_notes/user_notes_side_panel_ui.h"
 #include "chrome/browser/ui/webui/signin/sync_confirmation_ui.h"
 #include "chrome/browser/ui/webui/support_tool/support_tool_ui.h"
@@ -927,9 +926,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
     return &NewWebUI<ReadingListUI>;
   if (url.host_piece() == chrome::kChromeUIBookmarksSidePanelHost)
     return &NewWebUI<BookmarksSidePanelUI>;
-  if (url.host_piece() == chrome::kChromeUISearchCompanionSidePanelHost) {
-    return &NewWebUI<SearchCompanionSidePanelUI>;
-  }
   if (url.host_piece() == chrome::kChromeUICustomizeChromeSidePanelHost &&
       customize_chrome::IsSidePanelEnabled()) {
     return &NewWebUI<CustomizeChromeUI>;