Migrate ash/constants/ash_switches.* to namespace ash
This CL is part of the Chrome OS source code directory migration:
https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE.
Bug: 1157625, 1164001
Change-Id: Ia253571e495128dd9f571af94ced86ec2d1d3354
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3394954
Reviewed-by: Hidehiko Abe <[email protected]>
Owners-Override: Hidehiko Abe <[email protected]>
Commit-Queue: Henrique Ferreiro <[email protected]>
Cr-Commit-Position: refs/heads/main@{#960408}
diff --git a/chrome/app/chrome_crash_reporter_client.cc b/chrome/app/chrome_crash_reporter_client.cc
index 4ef92dc0..8bd4fa3 100644
--- a/chrome/app/chrome_crash_reporter_client.cc
+++ b/chrome/app/chrome_crash_reporter_client.cc
@@ -165,7 +165,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
bool is_guest_session = base::CommandLine::ForCurrentProcess()->HasSwitch(
- chromeos::switches::kGuestSession);
+ ash::switches::kGuestSession);
bool is_stable_channel =
chrome::GetChannel() == version_info::Channel::STABLE;
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index 483bc3a6..0a25150 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -869,9 +869,9 @@
// Initialize primary user homedir (in multi-profile session) as it may be
// passed as a command line switch.
base::FilePath homedir;
- if (command_line.HasSwitch(chromeos::switches::kHomedir)) {
+ if (command_line.HasSwitch(ash::switches::kHomedir)) {
homedir = base::FilePath(
- command_line.GetSwitchValueASCII(chromeos::switches::kHomedir));
+ command_line.GetSwitchValueASCII(ash::switches::kHomedir));
base::PathService::OverrideAndCreateIfNeeded(base::DIR_HOME, homedir, true,
false);
}
@@ -881,7 +881,7 @@
// up a command line to tell it that we want it to recover, and to preserve
// the original command line. Note: logging at this point is to /var/log/ui.
if ((base::SysInfo::IsRunningOnChromeOS() &&
- command_line.HasSwitch(chromeos::switches::kLoginUser)) ||
+ command_line.HasSwitch(ash::switches::kLoginUser)) ||
command_line.HasSwitch(switches::kDiagnosticsRecovery)) {
base::CommandLine interim_command_line(command_line.GetProgram());
const char* const kSwitchNames[] = {switches::kUserDataDir, };
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index ba42c1d..20a88b8 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -3205,7 +3205,7 @@
FEATURE_VALUE_TYPE(ash::features::kHideShelfControlsInTabletMode)},
{"shelf-hover-previews", flag_descriptions::kShelfHoverPreviewsName,
flag_descriptions::kShelfHoverPreviewsDescription, kOsCrOS,
- SINGLE_VALUE_TYPE(chromeos::switches::kShelfHoverPreviews)},
+ SINGLE_VALUE_TYPE(ash::switches::kShelfHoverPreviews)},
{"show-bluetooth-debug-log-toggle",
flag_descriptions::kShowBluetoothDebugLogToggleName,
flag_descriptions::kShowBluetoothDebugLogToggleDescription, kOsCrOS,
@@ -4354,7 +4354,7 @@
{"enable-touchscreen-calibration",
flag_descriptions::kTouchscreenCalibrationName,
flag_descriptions::kTouchscreenCalibrationDescription, kOsCrOS,
- SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchCalibrationSetting)},
+ SINGLE_VALUE_TYPE(ash::switches::kEnableTouchCalibrationSetting)},
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS_ASH)
{"audio-url", flag_descriptions::kAudioUrlName,
diff --git a/chrome/browser/apps/intent_helper/chromeos_intent_picker_helpers.cc b/chrome/browser/apps/intent_helper/chromeos_intent_picker_helpers.cc
index 5be304bc..85b8cf1 100644
--- a/chrome/browser/apps/intent_helper/chromeos_intent_picker_helpers.cc
+++ b/chrome/browser/apps/intent_helper/chromeos_intent_picker_helpers.cc
@@ -65,7 +65,7 @@
// picker if Chrome has been chosen by the user as the platform for this URL.
// TODO(crbug.com/1225828): Handle this for lacros-chrome as well.
#if BUILDFLAG(IS_CHROMEOS_ASH)
- if (chromeos::switches::IsTabletFormFactor()) {
+ if (ash::switches::IsTabletFormFactor()) {
if (ui_auto_display_service->GetLastUsedPlatformForTablets(url) ==
IntentPickerAutoDisplayPref::Platform::kChrome) {
return false;
@@ -163,7 +163,7 @@
bool should_persist) {
// TODO(crbug.com/1225828): Handle this for lacros-chrome as well.
#if BUILDFLAG(IS_CHROMEOS_ASH)
- if (chromeos::switches::IsTabletFormFactor() && should_persist) {
+ if (ash::switches::IsTabletFormFactor() && should_persist) {
// On devices of tablet form factor, until the user has decided to persist
// the setting, the browser-side intent picker should always be seen.
auto platform = IntentPickerAutoDisplayPref::Platform::kNone;
diff --git a/chrome/browser/ash/app_mode/kiosk_app_manager.cc b/chrome/browser/ash/app_mode/kiosk_app_manager.cc
index 6208911..d573286 100644
--- a/chrome/browser/ash/app_mode/kiosk_app_manager.cc
+++ b/chrome/browser/ash/app_mode/kiosk_app_manager.cc
@@ -274,9 +274,9 @@
// should not be present for kiosk sessions.
bool in_policy_switches_block = false;
const std::string policy_switches_begin =
- GetSwitchString(switches::kPolicySwitchesBegin);
+ GetSwitchString(chromeos::switches::kPolicySwitchesBegin);
const std::string policy_switches_end =
- GetSwitchString(switches::kPolicySwitchesEnd);
+ GetSwitchString(chromeos::switches::kPolicySwitchesEnd);
for (const auto& it : current_command_line->argv()) {
if (it == policy_switches_begin) {
diff --git a/chrome/browser/ash/app_restore/full_restore_policy_browsertest.cc b/chrome/browser/ash/app_restore/full_restore_policy_browsertest.cc
index 1f4df80..fa4e46ce 100644
--- a/chrome/browser/ash/app_restore/full_restore_policy_browsertest.cc
+++ b/chrome/browser/ash/app_restore/full_restore_policy_browsertest.cc
@@ -36,7 +36,7 @@
::full_restore::features::kArcGhostWindow},
{});
arc::SetArcAvailableCommandLineForTesting(command_line);
- command_line->AppendSwitch(chromeos::switches::kEnableArcVm);
+ command_line->AppendSwitch(switches::kEnableArcVm);
}
void SetUpInProcessBrowserTestFixture() override {
diff --git a/chrome/browser/ash/arc/arc_util.cc b/chrome/browser/ash/arc/arc_util.cc
index 81a2ab3..06a0010 100644
--- a/chrome/browser/ash/arc/arc_util.cc
+++ b/chrome/browser/ash/arc/arc_util.cc
@@ -365,7 +365,7 @@
if (IsArcPlayStoreEnabledPreferenceManagedForProfile(profile)) {
if (enabled && !IsArcPlayStoreEnabledForProfile(profile)) {
LOG(WARNING) << "Attempt to enable disabled by policy ARC.";
- if (chromeos::switches::IsTabletFormFactor()) {
+ if (ash::switches::IsTabletFormFactor()) {
VLOG(1) << "Showing contact admin dialog managed user of tablet form "
"factor devices.";
base::ThreadTaskRunnerHandle::Get()->PostTask(
diff --git a/chrome/browser/ash/arc/instance_throttle/arc_switch_throttle_observer.cc b/chrome/browser/ash/arc/instance_throttle/arc_switch_throttle_observer.cc
index f57bbc6..a303ab2 100644
--- a/chrome/browser/ash/arc/instance_throttle/arc_switch_throttle_observer.cc
+++ b/chrome/browser/ash/arc/instance_throttle/arc_switch_throttle_observer.cc
@@ -20,7 +20,7 @@
// regardless of state of other observers. So we always set throttling as
// CPU_RESTRICTION_FOREGROUND in the last case, that means no CPU restriction
// happens.
- SetActive(chromeos::switches::IsArcCpuRestrictionDisabled());
+ SetActive(ash::switches::IsArcCpuRestrictionDisabled());
}
} // namespace arc
diff --git a/chrome/browser/ash/arc/instance_throttle/arc_switch_throttle_observer_unittest.cc b/chrome/browser/ash/arc/instance_throttle/arc_switch_throttle_observer_unittest.cc
index f3e4c0b..9c65fd74 100644
--- a/chrome/browser/ash/arc/instance_throttle/arc_switch_throttle_observer_unittest.cc
+++ b/chrome/browser/ash/arc/instance_throttle/arc_switch_throttle_observer_unittest.cc
@@ -40,7 +40,7 @@
TEST_F(ArcSwitchThrottleObserverTest, Enforced) {
base::test::ScopedCommandLine command_line;
command_line.GetProcessCommandLine()->AppendSwitch(
- chromeos::switches::kDisableArcCpuRestriction);
+ ash::switches::kDisableArcCpuRestriction);
ArcSwitchThrottleObserver observer;
int call_count = 0;
int active_count = 0;
diff --git a/chrome/browser/ash/arc/policy/arc_policy_util.cc b/chrome/browser/ash/arc/policy/arc_policy_util.cc
index cb199bc..73f8543 100644
--- a/chrome/browser/ash/arc/policy/arc_policy_util.cc
+++ b/chrome/browser/ash/arc/policy/arc_policy_util.cc
@@ -39,7 +39,7 @@
bool IsArcDisabledForEnterprise() {
return base::CommandLine::ForCurrentProcess()->HasSwitch(
- chromeos::switches::kEnterpriseDisableArc);
+ ash::switches::kEnterpriseDisableArc);
}
std::set<std::string> GetRequestedPackagesFromArcPolicy(
diff --git a/chrome/browser/ash/arc/session/arc_session_manager.cc b/chrome/browser/ash/arc/session/arc_session_manager.cc
index eb0820da..93bc6e4 100644
--- a/chrome/browser/ash/arc/session/arc_session_manager.cc
+++ b/chrome/browser/ash/arc/session/arc_session_manager.cc
@@ -473,7 +473,7 @@
// for the presence of kEnableHoudiniDlc flag in the command line.
bool IsDlcRequired() {
return base::CommandLine::ForCurrentProcess()->HasSwitch(
- chromeos::switches::kEnableHoudiniDlc);
+ ash::switches::kEnableHoudiniDlc);
}
} // namespace
@@ -1785,7 +1785,7 @@
const bool is_arcvm = arc::IsArcVmEnabled();
bool add_native_bridge_64bit_support = false;
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
- chromeos::switches::kArcEnableNativeBridge64BitSupportExperiment)) {
+ ash::switches::kArcEnableNativeBridge64BitSupportExperiment)) {
PrefService* local_pref_service = g_browser_process->local_state();
if (base::FeatureList::IsEnabled(
arc::kNativeBridge64BitSupportExperimentFeature)) {
diff --git a/chrome/browser/ash/arc/session/arc_session_manager_unittest.cc b/chrome/browser/ash/arc/session/arc_session_manager_unittest.cc
index f398122..d5ea31c0 100644
--- a/chrome/browser/ash/arc/session/arc_session_manager_unittest.cc
+++ b/chrome/browser/ash/arc/session/arc_session_manager_unittest.cc
@@ -990,7 +990,7 @@
TEST_F(ArcSessionManagerTest, DataCleanUpOnFirstStart) {
base::test::ScopedCommandLine command_line;
command_line.GetProcessCommandLine()->AppendSwitch(
- chromeos::switches::kArcDataCleanupOnStart);
+ ash::switches::kArcDataCleanupOnStart);
arc_session_manager()->SetProfile(profile());
arc_session_manager()->Initialize();
@@ -1024,7 +1024,7 @@
TEST_F(ArcSessionManagerTest, DataCleanUpOnNextStart) {
base::test::ScopedCommandLine command_line;
command_line.GetProcessCommandLine()->AppendSwitch(
- chromeos::switches::kArcDataCleanupOnStart);
+ ash::switches::kArcDataCleanupOnStart);
PrefService* const prefs = profile()->GetPrefs();
prefs->SetBoolean(prefs::kArcTermsAccepted, true);
diff --git a/chrome/browser/ash/attestation/platform_verification_flow.cc b/chrome/browser/ash/attestation/platform_verification_flow.cc
index fb943480..403fa50 100644
--- a/chrome/browser/ash/attestation/platform_verification_flow.cc
+++ b/chrome/browser/ash/attestation/platform_verification_flow.cc
@@ -80,7 +80,7 @@
bool IsInSupportedMode() override {
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
return !command_line->HasSwitch(chromeos::switches::kSystemDevMode) ||
- command_line->HasSwitch(chromeos::switches::kAllowRAInDevMode);
+ command_line->HasSwitch(switches::kAllowRAInDevMode);
}
};
diff --git a/chrome/browser/ash/crosapi/browser_loader.cc b/chrome/browser/ash/crosapi/browser_loader.cc
index 821ced4..f7e2f6d 100644
--- a/chrome/browser/ash/crosapi/browser_loader.cc
+++ b/chrome/browser/ash/crosapi/browser_loader.cc
@@ -112,7 +112,7 @@
// rather than component manager.
base::FilePath lacros_chrome_path =
base::CommandLine::ForCurrentProcess()->GetSwitchValuePath(
- chromeos::switches::kLacrosChromePath);
+ ash::switches::kLacrosChromePath);
if (!lacros_chrome_path.empty()) {
OnLoadComplete(std::move(callback),
component_updater::CrOSComponentManager::Error::NONE,
diff --git a/chrome/browser/ash/crosapi/browser_manager.cc b/chrome/browser/ash/crosapi/browser_manager.cc
index 25ffc856..8a6e11b 100644
--- a/chrome/browser/ash/crosapi/browser_manager.cc
+++ b/chrome/browser/ash/crosapi/browser_manager.cc
@@ -284,12 +284,12 @@
bool IsKeepAliveDisabledForTesting() {
return base::CommandLine::ForCurrentProcess()->HasSwitch(
- chromeos::switches::kDisableLacrosKeepAliveForTesting);
+ ash::switches::kDisableLacrosKeepAliveForTesting);
}
bool IsLoginLacrosOpeningDisabledForTesting() {
return base::CommandLine::ForCurrentProcess()->HasSwitch(
- chromeos::switches::kDisableLoginLacrosOpening);
+ ash::switches::kDisableLoginLacrosOpening);
}
} // namespace
@@ -341,7 +341,7 @@
std::string socket_path =
base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
- chromeos::switches::kLacrosMojoSocketForTesting);
+ ash::switches::kLacrosMojoSocketForTesting);
if (!socket_path.empty()) {
test_mojo_connection_manager_ =
std::make_unique<crosapi::TestMojoConnectionManager>(
@@ -832,7 +832,7 @@
std::string additional_env =
base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
- chromeos::switches::kLacrosChromeAdditionalEnv);
+ ash::switches::kLacrosChromeAdditionalEnv);
base::StringPairs env_pairs;
if (base::SplitStringIntoKeyValuePairsUsingSubstr(additional_env, '=', "####",
&env_pairs)) {
@@ -874,7 +874,7 @@
std::string additional_flags =
base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
- chromeos::switches::kLacrosChromeAdditionalArgs);
+ ash::switches::kLacrosChromeAdditionalArgs);
std::vector<base::StringPiece> delimited_flags =
base::SplitStringPieceUsingSubstr(additional_flags, "####",
base::TRIM_WHITESPACE,
diff --git a/chrome/browser/ash/crosapi/crosapi_util.cc b/chrome/browser/ash/crosapi/crosapi_util.cc
index ed87d93..3432562 100644
--- a/chrome/browser/ash/crosapi/crosapi_util.cc
+++ b/chrome/browser/ash/crosapi/crosapi_util.cc
@@ -367,7 +367,7 @@
: crosapi::mojom::BrowserInitParams::InitialKeepAlive::kDisabled;
params->is_unfiltered_bluetooth_device_enabled =
- chromeos::switches::IsUnfilteredBluetoothDevicesEnabled();
+ ash::switches::IsUnfilteredBluetoothDevicesEnabled();
// Pass the accepted internal urls to lacros. Only accepted urls are allowed
// to be passed via OpenURL from Lacros to Ash.
diff --git a/chrome/browser/ash/crostini/crostini_features.cc b/chrome/browser/ash/crostini/crostini_features.cc
index 114a104..e48ba11 100644
--- a/chrome/browser/ash/crostini/crostini_features.cc
+++ b/chrome/browser/ash/crostini/crostini_features.cc
@@ -207,7 +207,7 @@
}
bool kernelnext = base::CommandLine::ForCurrentProcess()->HasSwitch(
- chromeos::switches::kKernelnextRestrictVMs);
+ ash::switches::kKernelnextRestrictVMs);
bool kernelnext_override =
base::FeatureList::IsEnabled(features::kKernelnextVMs);
if (kernelnext && !kernelnext_override) {
diff --git a/chrome/browser/ash/customization/customization_wallpaper_downloader_browsertest.cc b/chrome/browser/ash/customization/customization_wallpaper_downloader_browsertest.cc
index 76462da..2800ce64 100644
--- a/chrome/browser/ash/customization/customization_wallpaper_downloader_browsertest.cc
+++ b/chrome/browser/ash/customization/customization_wallpaper_downloader_browsertest.cc
@@ -182,8 +182,8 @@
}
void SetUpCommandLine(base::CommandLine* command_line) override {
- command_line->AppendSwitch(chromeos::switches::kLoginManager);
- command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
+ command_line->AppendSwitch(switches::kLoginManager);
+ command_line->AppendSwitchASCII(switches::kLoginProfile, "user");
}
void SetRequiredRetries(size_t retries) { required_retries_ = retries; }
diff --git a/chrome/browser/ash/drive/drive_integration_service_browsertest.cc b/chrome/browser/ash/drive/drive_integration_service_browsertest.cc
index 4fae2c5..ed06e13 100644
--- a/chrome/browser/ash/drive/drive_integration_service_browsertest.cc
+++ b/chrome/browser/ash/drive/drive_integration_service_browsertest.cc
@@ -178,7 +178,7 @@
class DriveIntegrationServiceWithGaiaDisabledBrowserTest
: public DriveIntegrationServiceBrowserTest {
void SetUpCommandLine(base::CommandLine* command_line) override {
- command_line->AppendSwitch(chromeos::switches::kDisableGaiaServices);
+ command_line->AppendSwitch(ash::switches::kDisableGaiaServices);
}
};
diff --git a/chrome/browser/ash/drive/file_system_util.cc b/chrome/browser/ash/drive/file_system_util.cc
index 4f73277..7db048e 100644
--- a/chrome/browser/ash/drive/file_system_util.cc
+++ b/chrome/browser/ash/drive/file_system_util.cc
@@ -77,7 +77,7 @@
// Disable Drive for non-Gaia accounts.
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
- chromeos::switches::kDisableGaiaServices)) {
+ ash::switches::kDisableGaiaServices)) {
return false;
}
if (!chromeos::LoginState::IsInitialized())
diff --git a/chrome/browser/ash/file_manager/external_filesystem_apitest.cc b/chrome/browser/ash/file_manager/external_filesystem_apitest.cc
index 8ef25c2..5336c7d 100644
--- a/chrome/browser/ash/file_manager/external_filesystem_apitest.cc
+++ b/chrome/browser/ash/file_manager/external_filesystem_apitest.cc
@@ -529,7 +529,7 @@
// Don't require policy for our sessions - this is required because
// this test creates a secondary profile synchronously, so we need to
// let the policy code know not to expect cached policy.
- command_line->AppendSwitchASCII(chromeos::switches::kProfileRequiresPolicy,
+ command_line->AppendSwitchASCII(ash::switches::kProfileRequiresPolicy,
"false");
}
diff --git a/chrome/browser/ash/file_manager/file_manager_browsertest_base.cc b/chrome/browser/ash/file_manager/file_manager_browsertest_base.cc
index e7ecc88..c550908 100644
--- a/chrome/browser/ash/file_manager/file_manager_browsertest_base.cc
+++ b/chrome/browser/ash/file_manager/file_manager_browsertest_base.cc
@@ -1724,9 +1724,9 @@
}
if (options.guest_mode == IN_GUEST_MODE) {
- command_line->AppendSwitch(chromeos::switches::kGuestSession);
- command_line->AppendSwitchNative(chromeos::switches::kLoginUser, "$guest");
- command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
+ command_line->AppendSwitch(ash::switches::kGuestSession);
+ command_line->AppendSwitchNative(ash::switches::kLoginUser, "$guest");
+ command_line->AppendSwitchASCII(ash::switches::kLoginProfile, "user");
command_line->AppendSwitch(switches::kIncognito);
set_chromeos_user_ = false;
}
diff --git a/chrome/browser/ash/hats/hats_notification_controller.cc b/chrome/browser/ash/hats/hats_notification_controller.cc
index e591ddc7..a7690a32 100644
--- a/chrome/browser/ash/hats/hats_notification_controller.cc
+++ b/chrome/browser/ash/hats/hats_notification_controller.cc
@@ -78,10 +78,9 @@
bool IsTestingEnabled(const HatsConfig& hats_config) {
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
- if (command_line->HasSwitch(
- chromeos::switches::kForceHappinessTrackingSystem)) {
+ if (command_line->HasSwitch(switches::kForceHappinessTrackingSystem)) {
auto switch_value = command_line->GetSwitchValueASCII(
- chromeos::switches::kForceHappinessTrackingSystem);
+ switches::kForceHappinessTrackingSystem);
return switch_value.empty() || hats_config.feature.name == switch_value;
}
diff --git a/chrome/browser/ash/kerberos/kerberos_credentials_manager_factory_browsertest.cc b/chrome/browser/ash/kerberos/kerberos_credentials_manager_factory_browsertest.cc
index 5243178..bb2aad6 100644
--- a/chrome/browser/ash/kerberos/kerberos_credentials_manager_factory_browsertest.cc
+++ b/chrome/browser/ash/kerberos/kerberos_credentials_manager_factory_browsertest.cc
@@ -20,8 +20,7 @@
: public InProcessBrowserTest {
protected:
void SetUpCommandLine(base::CommandLine* command_line) override {
- command_line->AppendSwitch(
- chromeos::switches::kIgnoreUserProfileMappingForTests);
+ command_line->AppendSwitch(switches::kIgnoreUserProfileMappingForTests);
}
};
diff --git a/chrome/browser/ash/login/chrome_restart_request.cc b/chrome/browser/ash/login/chrome_restart_request.cc
index 0500bf8..883d6c5 100644
--- a/chrome/browser/ash/login/chrome_restart_request.cc
+++ b/chrome/browser/ash/login/chrome_restart_request.cc
@@ -182,8 +182,8 @@
blink::switches::kEnableRasterSideDarkModeForImages,
blink::switches::kEnableZeroCopy,
blink::switches::kGpuRasterizationMSAASampleCount,
- chromeos::switches::kAshPowerButtonPosition,
- chromeos::switches::kAshSideVolumeButtonPosition,
+ switches::kAshPowerButtonPosition,
+ switches::kAshSideVolumeButtonPosition,
switches::kDefaultWallpaperLarge,
switches::kDefaultWallpaperSmall,
switches::kGuestWallpaperLarge,
@@ -225,7 +225,7 @@
switches::kLoginProfile,
switches::kNaturalScrollDefault,
switches::kRlzPingDelay,
- switches::kSystemInDevMode,
+ chromeos::switches::kSystemInDevMode,
policy::switches::kDeviceManagementUrl,
wm::switches::kWindowAnimationsDisabled,
};
diff --git a/chrome/browser/ash/login/demo_mode/demo_mode_detector.cc b/chrome/browser/ash/login/demo_mode/demo_mode_detector.cc
index 01cd64e3..0aac3a3 100644
--- a/chrome/browser/ash/login/demo_mode/demo_mode_detector.cc
+++ b/chrome/browser/ash/login/demo_mode/demo_mode_detector.cc
@@ -55,7 +55,7 @@
// Devices in retail won't be in dev mode, and DUTs (devices under test) often
// sit unused at OOBE for a while.
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kSystemDevMode) &&
+ chromeos::switches::kSystemDevMode) &&
!has_derelict_switch) {
return;
}
diff --git a/chrome/browser/ash/login/demo_mode/demo_mode_detector_unittest.cc b/chrome/browser/ash/login/demo_mode/demo_mode_detector_unittest.cc
index a44d5e8..126ef85 100644
--- a/chrome/browser/ash/login/demo_mode/demo_mode_detector_unittest.cc
+++ b/chrome/browser/ash/login/demo_mode/demo_mode_detector_unittest.cc
@@ -141,7 +141,7 @@
// Set the command line dev mode switch.
auto command_line_ = std::make_unique<base::test::ScopedCommandLine>();
command_line_->GetProcessCommandLine()->AppendSwitch(
- switches::kSystemDevMode);
+ chromeos::switches::kSystemDevMode);
StartDemoModeDetection();
diff --git a/chrome/browser/ash/login/enrollment/enrollment_embedded_policy_server_browsertest.cc b/chrome/browser/ash/login/enrollment/enrollment_embedded_policy_server_browsertest.cc
index 652a8a5f..c2d3556 100644
--- a/chrome/browser/ash/login/enrollment/enrollment_embedded_policy_server_browsertest.cc
+++ b/chrome/browser/ash/login/enrollment/enrollment_embedded_policy_server_browsertest.cc
@@ -440,7 +440,7 @@
IN_PROC_BROWSER_TEST_F(EnrollmentEmbeddedPolicyServerBase,
DeviceBlockDevmodeDisallowed) {
base::CommandLine::ForCurrentProcess()->AppendSwitch(
- ash::switches::kDisallowPolicyBlockDevMode);
+ switches::kDisallowPolicyBlockDevMode);
enterprise_management::ChromeDeviceSettingsProto proto;
proto.mutable_system_settings()->set_block_devmode(true);
policy_server_.UpdateDevicePolicy(proto);
diff --git a/chrome/browser/ash/login/existing_user_controller.cc b/chrome/browser/ash/login/existing_user_controller.cc
index 323262a..9ee4981 100644
--- a/chrome/browser/ash/login/existing_user_controller.cc
+++ b/chrome/browser/ash/login/existing_user_controller.cc
@@ -219,7 +219,7 @@
bool IsTestingMigrationUI() {
return base::CommandLine::ForCurrentProcess()->HasSwitch(
- chromeos::switches::kTestEncryptionMigrationUI);
+ switches::kTestEncryptionMigrationUI);
}
bool ShouldForceDircrypto(const AccountId& account_id) {
@@ -287,7 +287,7 @@
user_context.GetAccountId()) ==
user_manager::ProfileRequiresPolicy::kPolicyRequired ||
base::CommandLine::ForCurrentProcess()->HasSwitch(
- chromeos::switches::kProfileRequiresPolicy);
+ switches::kProfileRequiresPolicy);
// Force-migrate all home directories if the user is known to have enterprise
// policy, otherwise ask the user.
diff --git a/chrome/browser/ash/login/saml/saml_browsertest.cc b/chrome/browser/ash/login/saml/saml_browsertest.cc
index 7af8fd5..63397c77 100644
--- a/chrome/browser/ash/login/saml/saml_browsertest.cc
+++ b/chrome/browser/ash/login/saml/saml_browsertest.cc
@@ -1084,7 +1084,7 @@
SamlTestBase::SetUpCommandLine(command_line);
// Disable token check to allow offline sign-in for the fake gaia users.
- command_line->AppendSwitch(chromeos::switches::kDisableGaiaServices);
+ command_line->AppendSwitch(switches::kDisableGaiaServices);
}
void SAMLPolicyTest::SetSAMLOfflineSigninTimeLimitPolicy(int limit) {
diff --git a/chrome/browser/ash/login/screens/chromevox_hint/chromevox_hint_detector.cc b/chrome/browser/ash/login/screens/chromevox_hint/chromevox_hint_detector.cc
index 7b97543..81bafea 100644
--- a/chrome/browser/ash/login/screens/chromevox_hint/chromevox_hint_detector.cc
+++ b/chrome/browser/ash/login/screens/chromevox_hint/chromevox_hint_detector.cc
@@ -38,7 +38,7 @@
// This is done so that developers and testers don't repeatedly receive
// the hint when flashing.
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kSystemDevMode) &&
+ chromeos::switches::kSystemDevMode) &&
!switches::IsOOBEChromeVoxHintEnabledForDevMode()) {
return;
}
diff --git a/chrome/browser/ash/login/screens/chromevox_hint/chromevox_hint_detector_unittest.cc b/chrome/browser/ash/login/screens/chromevox_hint/chromevox_hint_detector_unittest.cc
index f4176eb..fa35a04 100644
--- a/chrome/browser/ash/login/screens/chromevox_hint/chromevox_hint_detector_unittest.cc
+++ b/chrome/browser/ash/login/screens/chromevox_hint/chromevox_hint_detector_unittest.cc
@@ -116,7 +116,7 @@
TEST_F(ChromeVoxHintDetectorTest, NoHintInDevMode) {
auto command_line_ = std::make_unique<base::test::ScopedCommandLine>();
command_line_->GetProcessCommandLine()->AppendSwitch(
- switches::kSystemDevMode);
+ chromeos::switches::kSystemDevMode);
ExpectChromeVoxHintWillNotBeGiven();
StartDetection();
runner_->FastForwardBy(kFullIdleDuration);
@@ -127,7 +127,7 @@
TEST_F(ChromeVoxHintDetectorTest, HintInDevModeWithEnablingSwitch) {
auto command_line_ = std::make_unique<base::test::ScopedCommandLine>();
command_line_->GetProcessCommandLine()->AppendSwitch(
- switches::kSystemDevMode);
+ chromeos::switches::kSystemDevMode);
command_line_->GetProcessCommandLine()->AppendSwitch(
switches::kEnableOOBEChromeVoxHintForDevMode);
ExpectChromeVoxHintWillBeGiven();
@@ -140,7 +140,7 @@
TEST_F(ChromeVoxHintDetectorTest, NoHintWithDisablingSwitchInDevMode) {
auto command_line_ = std::make_unique<base::test::ScopedCommandLine>();
command_line_->GetProcessCommandLine()->AppendSwitch(
- switches::kSystemDevMode);
+ chromeos::switches::kSystemDevMode);
command_line_->GetProcessCommandLine()->AppendSwitch(
switches::kEnableOOBEChromeVoxHintForDevMode);
command_line_->GetProcessCommandLine()->AppendSwitch(
diff --git a/chrome/browser/ash/login/screens/sync_consent_browsertest.cc b/chrome/browser/ash/login/screens/sync_consent_browsertest.cc
index 2ce7ddf3..ea36055 100644
--- a/chrome/browser/ash/login/screens/sync_consent_browsertest.cc
+++ b/chrome/browser/ash/login/screens/sync_consent_browsertest.cc
@@ -692,8 +692,7 @@
class SyncConsentTimeoutTest : public SyncConsentTest {
public:
void SetUpCommandLine(base::CommandLine* command_line) override {
- command_line->AppendSwitch(
- ::chromeos::switches::kOobeTriggerSyncTimeoutForTests);
+ command_line->AppendSwitch(switches::kOobeTriggerSyncTimeoutForTests);
SyncConsentTest::SetUpCommandLine(command_line);
}
};
diff --git a/chrome/browser/ash/login/screens/update_required_screen.cc b/chrome/browser/ash/login/screens/update_required_screen.cc
index e8dccffc..f2a9472 100644
--- a/chrome/browser/ash/login/screens/update_required_screen.cc
+++ b/chrome/browser/ash/login/screens/update_required_screen.cc
@@ -107,7 +107,7 @@
const chromeos::UpdateEngineClient::EolInfo& info) {
// TODO(crbug.com/1020616) : Handle if the device is left on this screen
// for long enough to reach Eol.
- if (chromeos::switches::IsAueReachedForUpdateRequiredForTest() ||
+ if (switches::IsAueReachedForUpdateRequiredForTest() ||
(!info.eol_date.is_null() && info.eol_date <= clock_->Now())) {
EnsureScreenIsShown();
if (view_) {
diff --git a/chrome/browser/ash/login/screens/welcome_screen_browsertest.cc b/chrome/browser/ash/login/screens/welcome_screen_browsertest.cc
index 1d27919..91b3c7f 100644
--- a/chrome/browser/ash/login/screens/welcome_screen_browsertest.cc
+++ b/chrome/browser/ash/login/screens/welcome_screen_browsertest.cc
@@ -152,7 +152,7 @@
// WelcomeScreenBrowserTest:
void SetUpCommandLine(base::CommandLine* command_line) override {
WelcomeScreenBrowserTest::SetUpCommandLine(command_line);
- command_line->AppendSwitch(switches::kSystemDevMode);
+ command_line->AppendSwitch(chromeos::switches::kSystemDevMode);
}
};
diff --git a/chrome/browser/ash/login/session/chrome_session_manager_browsertest.cc b/chrome/browser/ash/login/session/chrome_session_manager_browsertest.cc
index 6da3327..80657ed8 100644
--- a/chrome/browser/ash/login/session/chrome_session_manager_browsertest.cc
+++ b/chrome/browser/ash/login/session/chrome_session_manager_browsertest.cc
@@ -349,12 +349,11 @@
}
void SetUpCommandLine(base::CommandLine* command_line) override {
- command_line->AppendSwitch(ash::switches::kGuestSession);
+ command_line->AppendSwitch(switches::kGuestSession);
command_line->AppendSwitch(::switches::kIncognito);
- command_line->AppendSwitchASCII(ash::switches::kLoginProfile, "hash");
+ command_line->AppendSwitchASCII(switches::kLoginProfile, "hash");
command_line->AppendSwitchASCII(
- ash::switches::kLoginUser,
- user_manager::GuestAccountId().GetUserEmail());
+ switches::kLoginUser, user_manager::GuestAccountId().GetUserEmail());
}
// Test instance parameters.
diff --git a/chrome/browser/ash/login/session/user_session_manager.cc b/chrome/browser/ash/login/session/user_session_manager.cc
index 1a9ac8fc..b4689ac1 100644
--- a/chrome/browser/ash/login/session/user_session_manager.cc
+++ b/chrome/browser/ash/login/session/user_session_manager.cc
@@ -225,7 +225,7 @@
base::TimeDelta GetActivityTimeBeforeOnboardingSurvey() {
auto* command_line = base::CommandLine::ForCurrentProcess();
const auto& time_switch =
- chromeos::switches::kTimeBeforeOnboardingSurveyInSecondsForTesting;
+ switches::kTimeBeforeOnboardingSurveyInSecondsForTesting;
if (!command_line->HasSwitch(time_switch)) {
return kActivityTimeBeforeOnboardingSurvey;
diff --git a/chrome/browser/ash/login/test/session_flags_manager.cc b/chrome/browser/ash/login/test/session_flags_manager.cc
index ea5a2d7..01e217be 100644
--- a/chrome/browser/ash/login/test/session_flags_manager.cc
+++ b/chrome/browser/ash/login/test/session_flags_manager.cc
@@ -61,11 +61,11 @@
void SessionFlagsManager::SetDefaultLoginSwitches(
const std::vector<Switch>& switches) {
- default_switches_ = {{switches::kPolicySwitchesBegin, ""}};
+ default_switches_ = {{chromeos::switches::kPolicySwitchesBegin, ""}};
default_switches_.insert(default_switches_.end(), switches.begin(),
switches.end());
default_switches_.emplace_back(
- std::make_pair(switches::kPolicySwitchesEnd, ""));
+ std::make_pair(chromeos::switches::kPolicySwitchesEnd, ""));
}
void SessionFlagsManager::AppendSwitchesToCommandLine(
diff --git
