arc: Remove obsolete commandline switch

--enable-arc-oobe-optin-no-skip commandline switch is no longer needed
as all Chrome OS devices enable it. This change removes the switch and
makes its behavior the default so we can remove it from the Chrome OS
builds.

Bug: 1059048
Test: OOBE flow on Chromebook
Change-Id: Idf85a61afa34077691edf5d7f261f96c4e81e4f6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2091652
Auto-Submit: Josh Horwich <jhorwich@chromium.org>
Reviewed-by: Alexander Alekseev <alemate@chromium.org>
Reviewed-by: Long Cheng <lgcheng@google.com>
Commit-Queue: Alexander Alekseev <alemate@chromium.org>
Cr-Commit-Position: refs/heads/master@{#748448}

chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.cc

@@ -287,12 +287,11 @@ void ArcTermsOfServiceScreenHandler::DoShow() {
   // ToS then prefs::kArcEnabled is automatically reset in ArcSessionManager.
   arc::SetArcPlayStoreEnabledForProfile(profile, true);
 
-  // Hide the Skip button if the ToS screen can not be skipped during OOBE.
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          chromeos::switches::kEnableArcOobeOptinNoSkip) ||
-      arc::IsArcPlayStoreEnabledPreferenceManagedForProfile(profile)) {
-    CallJS("login.ArcTermsOfServiceScreen.hideSkipButton");
-  }
+  // Hide the Skip button in the ToS screen.
+  // TODO(crbug.com/1059048) Remove this when the ToS screen no longer has
+  // the skip button altogether. We call it all the time now so we can
+  // remove a Chrome OS flag.
+  CallJS("login.ArcTermsOfServiceScreen.hideSkipButton");
 
   action_taken_ = false;
 

chromeos/constants/chromeos_switches.cc

@@ -246,9 +246,6 @@ const char kDisableWakeOnWifi[] = "disable-wake-on-wifi";
 // Enables starting the ARC instance upon session start.
 const char kEnableArc[] = "enable-arc";
 
-// Enables "hide Skip button" for ARC setup in the OOBE flow.
-const char kEnableArcOobeOptinNoSkip[] = "enable-arc-oobe-optin-no-skip";
-
 // Enables ARC VM.
 const char kEnableArcVm[] = "enable-arcvm";
 

chromeos/constants/chromeos_switches.h

@@ -99,7 +99,6 @@ extern const char kDisableVolumeAdjustSound[];
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS) extern const char kDisableWakeOnWifi[];
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS) extern const char kEnableArc[];
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
-extern const char kEnableArcOobeOptinNoSkip[];
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS) extern const char kEnableArcVm[];
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS) extern const char kEnableCastReceiver[];
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS)