Delete simple_browser service

In the absence of Mus+ash this is no longer particularly useful for
development. Given that it's a developer-facing feature with no active
users, and given that we're moving all services away from Service
Manager, we might as well just delete this instead of porting it.
So...DELETE.

Bug: 977637
Change-Id: I10c690cf290849dbe96a223890d8ead6b89980fd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1740129
Commit-Queue: Ken Rockot <rockot@google.com>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#685078}

chrome/app/BUILD.gn

@@ -567,11 +567,6 @@ source_set("builtin_service_manifests") {
     deps += [ "//components/services/pdf_compositor/public/cpp:manifest" ]
   }
 
-  if (enable_simple_browser_service_in_process ||
-      enable_simple_browser_service_out_of_process) {
-    deps += [ "//services/content/simple_browser/public/cpp:manifest" ]
-  }
-
   if (is_win) {
     deps += [ "//chrome/services/wifi_util_win/public/cpp:manifest" ]
   }

chrome/app/DEPS

@@ -95,7 +95,6 @@ specific_include_rules = {
     "+components/startup_metric_utils/common",
     "+extensions/buildflags",
     "+mash/public",
-    "+services/content/simple_browser",
     "+services/proxy_resolver",
   ],
 }

chrome/app/builtin_service_manifests.cc

@@ -33,21 +33,13 @@
 #include "components/services/pdf_compositor/public/cpp/manifest.h"  // nogncheck
 #endif
 
-#if BUILDFLAG(ENABLE_SIMPLE_BROWSER_SERVICE_IN_PROCESS) || \
-    BUILDFLAG(ENABLE_SIMPLE_BROWSER_SERVICE_OUT_OF_PROCESS)
-#include "services/content/simple_browser/public/cpp/manifest.h"  // nogncheck
-#endif
-
 const std::vector<service_manager::Manifest>&
 GetChromeBuiltinServiceManifests() {
   static base::NoDestructor<std::vector<service_manager::Manifest>> manifests{{
       quarantine::GetQuarantineManifest(),
 #if BUILDFLAG(ENABLE_PRINTING)
       printing::GetPdfCompositorManifest(),
 #endif
-#if BUILDFLAG(ENABLE_SIMPLE_BROWSER_SERVICE_IN_PROCESS)
-      simple_browser::GetManifest(),
-#endif
 #if defined(OS_WIN)
       GetWifiUtilWinManifest(),
 #endif

chrome/browser/BUILD.gn

@@ -4921,17 +4921,6 @@ jumbo_split_static_library("browser") {
     ]
   }
 
-  if (enable_simple_browser_service_in_process) {
-    deps += [
-      "//services/content/simple_browser",
-      "//services/content/simple_browser/public/mojom",
-    ]
-  }
-
-  if (enable_simple_browser_service_out_of_process) {
-    deps += [ "//services/content/simple_browser/public/mojom" ]
-  }
-
   if (enable_spellcheck) {
     sources += [
       "spellchecker/spell_check_host_chrome_impl.cc",

chrome/browser/DEPS

@@ -291,7 +291,6 @@ include_rules = [
   "+rlz",
   "+sandbox/win/src",  # The path doesn't say it, but this is the Windows sandbox.
   "+services/audio/public",
-  "+services/content/simple_browser",
   "+services/data_decoder/public",
   "+services/device/public",
   "+services/identity/public",

chrome/browser/chrome_browser_main.cc

@@ -328,11 +328,6 @@
 #include "ui/aura/env.h"
 #endif
 
-#if BUILDFLAG(ENABLE_SIMPLE_BROWSER_SERVICE_IN_PROCESS) || \
-    BUILDFLAG(ENABLE_SIMPLE_BROWSER_SERVICE_OUT_OF_PROCESS)
-#include "services/content/simple_browser/public/mojom/constants.mojom.h"
-#endif
-
 #if !defined(OS_ANDROID)
 #include "chrome/browser/component_updater/intervention_policy_database_component_installer.h"
 #include "chrome/browser/resource_coordinator/tab_manager.h"
@@ -1825,19 +1820,6 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
   }
 #endif  // defined(OS_ANDROID)
 
-
-#if BUILDFLAG(ENABLE_SIMPLE_BROWSER_SERVICE_OUT_OF_PROCESS) || \
-    BUILDFLAG(ENABLE_SIMPLE_BROWSER_SERVICE_IN_PROCESS)
-  if (parsed_command_line().HasSwitch(switches::kLaunchSimpleBrowserSwitch) ||
-      parsed_command_line().HasSwitch(
-          switches::kLaunchInProcessSimpleBrowserSwitch)) {
-    // TODO(https://crbug.com/904148): This should not use |WarmService()|.
-    content::BrowserContext::GetConnectorFor(profile_)->WarmService(
-        service_manager::ServiceFilter::ByName(
-            simple_browser::mojom::kServiceName));
-  }
-#endif
-
   return result_code_;
 }
 

chrome/browser/chrome_content_browser_client.cc

@@ -606,15 +606,6 @@
 #include "chrome/browser/offline_pages/offline_page_url_loader_request_interceptor.h"
 #endif
 
-#if BUILDFLAG(ENABLE_SIMPLE_BROWSER_SERVICE_IN_PROCESS)
-#include "services/content/simple_browser/public/mojom/constants.mojom.h"
-#include "services/content/simple_browser/simple_browser_service.h"
-#endif
-
-#if BUILDFLAG(ENABLE_SIMPLE_BROWSER_SERVICE_OUT_OF_PROCESS)
-#include "services/content/simple_browser/public/mojom/constants.mojom.h"
-#endif
-
 #if BUILDFLAG(ENABLE_VR) && !defined(OS_ANDROID)
 #include "device/vr/public/mojom/isolated_xr_service.mojom.h"
 #endif
@@ -3960,18 +3951,6 @@ void ChromeContentBrowserClient::RunServiceInstance(
   }
 #endif
 
-#if BUILDFLAG(ENABLE_SIMPLE_BROWSER_SERVICE_IN_PROCESS)
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kLaunchInProcessSimpleBrowserSwitch) &&
-      service_name == simple_browser::mojom::kServiceName) {
-    service_manager::Service::RunAsyncUntilTermination(
-        std::make_unique<simple_browser::SimpleBrowserService>(
-            std::move(*receiver), simple_browser::SimpleBrowserService::
-                                      UIInitializationMode::kUseEnvironmentUI));
-    return;
-  }
-#endif
-
 #if defined(OS_CHROMEOS)
   if (base::FeatureList::IsEnabled(
           chromeos::features::kUpdatedCellularActivationUi) &&

chrome/common/BUILD.gn

@@ -45,8 +45,6 @@ buildflag_header("buildflags") {
     "ENABLE_NATIVE_NOTIFICATIONS=$enable_native_notifications",
     "ENABLE_SERVICE_DISCOVERY=$enable_service_discovery",
     "ENABLE_SESSION_SERVICE=$enable_session_service",
-    "ENABLE_SIMPLE_BROWSER_SERVICE_IN_PROCESS=$enable_simple_browser_service_in_process",
-    "ENABLE_SIMPLE_BROWSER_SERVICE_OUT_OF_PROCESS=$enable_simple_browser_service_out_of_process",
     "ENABLE_SUPERVISED_USERS=$enable_supervised_users",
     "ENABLE_WAYLAND_SERVER=$enable_wayland_server",
     "ENABLE_WEBUI_TAB_STRIP=$enable_webui_tab_strip",

chrome/common/chrome_switches.cc

@@ -377,17 +377,6 @@ const char kKioskMode[]                     = "kiosk";
 // Enable automatically pressing the print button in print preview.
 const char kKioskModePrinting[]             = "kiosk-printing";
 
-// Launches an in-process instance of the simple_browser service on startup if
-// this Chrome build supports it. See |enable_simple_browser_service_in_process|
-// in chrome/common/features.gni.
-const char kLaunchInProcessSimpleBrowserSwitch[] =
-    "launch-in-process-simple-browser";
-
-// Launches a sandboxed out-of-process instance of the simple_browser service on
-// startup if this Chrome build supports it. See
-// |enable_simple_browser_service_out_of_process| in chrome/common/features.gni.
-const char kLaunchSimpleBrowserSwitch[] = "launch-simple-browser";
-
 // Loads the Media Router component extension on startup.
 const char kLoadMediaRouterComponentExtension[] =
     "load-media-router-component-extension";

chrome/common/features.gni

@@ -50,14 +50,6 @@ declare_args() {
   # Android stores them separately on the Java side.
   enable_session_service = !is_android && !is_chromecast
 
-  # Enables embedding of the simple_browser service, a lightweight browser
-  # application which consumes the Content Service. Useful primarily for
-  # developer testing.
-  enable_simple_browser_service_in_process =
-      use_aura && (is_debug || dcheck_always_on) && !is_chromecast
-  enable_simple_browser_service_out_of_process =
-      is_chromeos && (is_debug || dcheck_always_on)
-
   enable_supervised_users = is_chromeos || is_android
 
   # Indicates if Wayland display server support is enabled.

chrome/utility/BUILD.gn

@@ -219,13 +219,6 @@ static_library("utility") {
       "//device/vr/public/mojom",
     ]
   }
-
-  if (enable_simple_browser_service_out_of_process) {
-    deps += [
-      "//services/content/simple_browser",
-      "//services/content/simple_browser/public/mojom",
-    ]
-  }
 }
 
 if (!is_android) {

chrome/utility/DEPS

@@ -40,7 +40,6 @@ include_rules = [
   "+extensions/common",
   "+extensions/buildflags",
   "+media",
-  "+services/content/simple_browser",
   "+services/network/public",
   "+services/network/url_request_context_builder_mojo.h",
   "+services/proxy_resolver",

chrome/utility/chrome_content_utility_client.cc

@@ -73,11 +73,6 @@
 #include "chrome/utility/printing_handler.h"
 #endif
 
-#if BUILDFLAG(ENABLE_SIMPLE_BROWSER_SERVICE_OUT_OF_PROCESS)
-#include "services/content/simple_browser/public/mojom/constants.mojom.h"  // nogncheck
-#include "services/content/simple_browser/simple_browser_service.h"  // nogncheck
-#endif
-
 namespace {
 
 base::LazyInstance<ChromeContentUtilityClient::NetworkBinderCreationCallback>::
@@ -197,14 +192,6 @@ ChromeContentUtilityClient::MaybeCreateMainThreadService(
   }
 #endif
 
-#if BUILDFLAG(ENABLE_SIMPLE_BROWSER_SERVICE_OUT_OF_PROCESS)
-  if (service_name == simple_browser::mojom::kServiceName) {
-    return std::make_unique<simple_browser::SimpleBrowserService>(
-        std::move(request), simple_browser::SimpleBrowserService::
-                                UIInitializationMode::kInitializeUI);
-  }
-#endif
-
 #if defined(OS_CHROMEOS)
   if (service_name == chromeos::ime::mojom::kServiceName)
     return std::make_unique<chromeos::ime::ImeService>(std::move(request));