Revert of [Merge to M50] Enable bootstrapping feature by default.

chromeos/chromeos_switches.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/chromeos_switches.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 
 // TODO(rsorokin): alphabetize all of these switches so they
@@ skipping 236 matching lines @@
 // Disable GAIA services such as enrollment and OAuth session restore. Used by
 // 'fake' telemetry login.
 const char kDisableGaiaServices[] = "disable-gaia-services";
 
 // Interval at which we check for total time on OOBE.
 const char kOobeTimerInterval[] = "oobe-timer-interval";
 
 // Indicates that a guest session has been started before OOBE completion.
 const char kOobeGuestSession[] = "oobe-guest-session";
 
-// Indicates that if we should start bootstrapping Master OOBE.
+// Indicates that if we should start bootstrapping Master/Slave OOBE.
 const char kOobeBootstrappingMaster[] = "oobe-bootstrapping-master";
+const char kOobeBootstrappingSlave[] = "oobe-bootstrapping-slave";
 
 // Specifies power stub behavior:
 //  'cycle=2' - Cycles power states every 2 seconds.
 // See FakeDBusThreadManager::ParsePowerCommandLineSwitch for full details.
 const char kPowerStub[] = "power-stub";
 
 // Overrides network stub behavior. By default, ethernet, wifi and vpn are
 // enabled, and transitions occur instantaneously. Multiple options can be
 // comma separated (no spaces). Note: all options are in the format 'foo=x'.
 // Values are case sensitive and based on Shill names in service_constants.h.
@@ skipping 132 matching lines @@
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (!command_line->HasSwitch(kTestCrosGaiaIdMigration))
     return false;
 
   return command_line->GetSwitchValueASCII(kTestCrosGaiaIdMigration) ==
          kTestCrosGaiaIdMigrationStarted;
 }
 
 }  // namespace switches
 }  // namespace chromeos