Remove retail mode.

components/policy/core/common/cloud/cloud_policy_constants.h

Index: components/policy/core/common/cloud/cloud_policy_constants.h
diff --git a/components/policy/core/common/cloud/cloud_policy_constants.h b/components/policy/core/common/cloud/cloud_policy_constants.h
index 4168e84b3a3e4eca1023c97dff0777595040d352..0b9180199472056f104b9d505ca6a1ab09e0e3be 100644
--- a/components/policy/core/common/cloud/cloud_policy_constants.h
+++ b/components/policy/core/common/cloud/cloud_policy_constants.h
@@ -109,13 +109,19 @@ enum DeviceManagementStatus {
 
 // List of modes that the device can be locked into.
 enum DeviceMode {
-  DEVICE_MODE_PENDING,         // The device mode is not yet available.
-  DEVICE_MODE_NOT_SET,         // The device is not yet enrolled or owned.
-  DEVICE_MODE_CONSUMER,        // The device is locally owned as consumer
-                               // device.
-  DEVICE_MODE_ENTERPRISE,      // The device is enrolled as an enterprise
-                               // device.
-  DEVICE_MODE_RETAIL_KIOSK,    // The device is enrolled as retail kiosk device.
+  DEVICE_MODE_PENDING,             // The device mode is not yet available.
+  DEVICE_MODE_NOT_SET,             // The device is not yet enrolled or owned.
+  DEVICE_MODE_CONSUMER,            // The device is locally owned as consumer
+                                   // device.
+  DEVICE_MODE_ENTERPRISE,          // The device is enrolled as an enterprise
+                                   // device.
+  DEVICE_MODE_LEGACY_RETAIL_MODE,  // The device is enrolled as retail kiosk
+                                   // device. Even though retail mode is
+                                   // deprecated, we still check for this device
+                                   // mode so that if a device has still been

[bartfab (slow), 2014/11/27 16:25:48]

Nit: s/a device has still been left/an existing device is still enrolled/

[rkc, 2014/12/01 19:15:05]

Done.

+                                   // left in retail mode, we take the
+                                   // appropriate action (currently, launching
+                                   // offline demo mode).
   DEVICE_MODE_CONSUMER_KIOSK_AUTOLAUNCH,  // The device is locally owned as
                                           // consumer kiosk with ability to auto
                                           // launch a kiosk webapp.