Host pairing OOBE starts at the right time.

chromeos/chromeos_switches.cc

Index: chromeos/chromeos_switches.cc
diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc
index 6e4081b87f7c2157a6eda487f5d71e10646c3d36..33b24d62e4ce9633ffaf8a99480fde40a2355ce9 100644
--- a/chromeos/chromeos_switches.cc
+++ b/chromeos/chromeos_switches.cc
@@ -157,6 +157,9 @@ const char kHasChromeOSDiamondKey[] = "has-chromeos-diamond-key";
 // Defines user homedir. This defaults to primary user homedir.
 const char kHomedir[]           = "homedir";
 
+// With this switch, start remora OOBE with the pairing screen.
+const char kHostPairingOobe[] = "host-pairing-oobe";
+
 // If true, profile selection in UserManager will always return active user's
 // profile.
 // TODO(nkostlyev): http://crbug.com/364604 - Get rid of this switch after we
@@ -216,10 +219,6 @@ const char kPowerStub[] = "power-stub";
 //  'interactive=3' - Interactive mode, connect/scan/etc requests take 3 secs
 const char kShillStub[] = "shill-stub";
 
-// If this switch is set, controller pairing process is displayed after update
-// stage of OOBE.
-const char kShowHostPairingDemo[] = "show-host-pairing-demo";
-
 // Sends test messages on first call to RequestUpdate (stub only).
 const char kSmsTestMessages[] = "sms-test-messages";