Move crostini/crostini_terminal to guest_os/guest_os_terminal
Part 3 of 3 in turning crostini_terminal into guest_os_terminal, this
does the actual move, including changing the namespace and updating all
references.
Bug: b:233287586
Test: CQ
Change-Id: I47ae084e4c2c1b89d121b8f5006fc2cfcec15f23
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3758167
Reviewed-by: Nicholas Verne <[email protected]>
Reviewed-by: Joel Hockey <[email protected]>
Commit-Queue: David Munro <[email protected]>
Reviewed-by: Dominick Ng <[email protected]>
Reviewed-by: Nic Hollingum <[email protected]>
Reviewed-by: Dominic Battré <[email protected]>
Reviewed-by: Jeffrey Young <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1027610}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 20969d8..eee41c7f 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -325,7 +325,6 @@
#include "chrome/browser/ash/crosapi/browser_util.h"
#include "chrome/browser/ash/crosapi/network_settings_service_ash.h"
#include "chrome/browser/ash/crostini/crostini_pref_names.h"
-#include "chrome/browser/ash/crostini/crostini_terminal.h"
#include "chrome/browser/ash/cryptauth/client_app_metadata_provider_service.h"
#include "chrome/browser/ash/cryptauth/cryptauth_device_id_provider_impl.h"
#include "chrome/browser/ash/customization/customization_document.h"
@@ -335,6 +334,7 @@
#include "chrome/browser/ash/guest_os/guest_id.h"
#include "chrome/browser/ash/guest_os/guest_os_mime_types_service.h"
#include "chrome/browser/ash/guest_os/guest_os_pref_names.h"
+#include "chrome/browser/ash/guest_os/guest_os_terminal.h"
#include "chrome/browser/ash/lock_screen_apps/state_controller.h"
#include "chrome/browser/ash/login/demo_mode/demo_mode_resources_remover.h"
#include "chrome/browser/ash/login/demo_mode/demo_session.h"
@@ -1972,7 +1972,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
// Added 05/2022.
// TODO(crbug.com/1028898): Remove after M110.
- crostini::RemoveTerminalFromRegistry(profile_prefs);
+ guest_os::RemoveTerminalFromRegistry(profile_prefs);
#endif
#if !BUILDFLAG(IS_CHROMEOS_ASH)
