Remove retail mode.

chrome/browser/chromeos/policy/proto/chrome_device_policy.proto

Index: chrome/browser/chromeos/policy/proto/chrome_device_policy.proto
diff --git a/chrome/browser/chromeos/policy/proto/chrome_device_policy.proto b/chrome/browser/chromeos/policy/proto/chrome_device_policy.proto
index f5c1a4cd9b669076f92b61343f8bb82b52c28458..00133547d5c5ed643aa196b6538534d401ad1b67 100644
--- a/chrome/browser/chromeos/policy/proto/chrome_device_policy.proto
+++ b/chrome/browser/chromeos/policy/proto/chrome_device_policy.proto
@@ -107,7 +107,7 @@ message EphemeralUsersEnabledProto {
 }
 
 // Details of an extension to install as part of the AppPack.
-message AppPackEntryProto {
+message OBSOLETE_AppPackEntryProto {
   optional string extension_id = 1;

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

Nit: Add OBSOLETE_ and deprecated = true.

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

Done.

   optional string update_url = 2;

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

Nit: Add OBSOLETE_ and deprecated = true.

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

Done.

 
@@ -116,9 +116,9 @@ message AppPackEntryProto {
   optional bool OBSOLETE_online_only = 3 [deprecated = true];
 }
 
-message AppPackProto {
+message OBSOLETE_AppPackProto {
   // List of extensions to install as part of the AppPack.
-  repeated AppPackEntryProto app_pack = 1;
+  repeated OBSOLETE_AppPackEntryProto app_pack = 1 [deprecated = true];
 }
 
 // This is a special policy for kiosk/retail mode that specifies what apps
@@ -129,7 +129,7 @@ message PinnedAppsProto {
   repeated string app_id = 1;

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

Nit: Add OBSOLETE_ and deprecated = true.

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

I thought that Mattias mentioned that this is still used elsewhere? That is why
I left this one alone.

 }
 
-message ForcedLogoutTimeoutsProto {
+message OBSOLETE_ForcedLogoutTimeoutsProto {
   // All timeouts are specified in milliseconds.
 
   // Specifies the timeout before an idle user session is terminated.
@@ -142,7 +142,7 @@ message ForcedLogoutTimeoutsProto {
   optional int64 idle_logout_warning_duration = 2;

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

Nit: Add OBSOLETE_ and deprecated = true.

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

Done.

 }
 
-message ScreenSaverProto {
+message OBSOLETE_ScreenSaverProto {
   // Specifies the extension ID which is to be used as a screen saver on the
   // login screen if no user activity is present. Only respected if the device
   // is in RETAIL mode.
@@ -597,9 +597,11 @@ message ChromeDeviceSettingsProto {
   optional DeviceOpenNetworkConfigurationProto open_network_configuration = 11;
   optional DeviceReportingProto device_reporting = 12;
   optional EphemeralUsersEnabledProto ephemeral_users_enabled = 13;
-  optional AppPackProto app_pack = 14;
-  optional ForcedLogoutTimeoutsProto forced_logout_timeouts = 15;
-  optional ScreenSaverProto login_screen_saver = 16;
+  optional OBSOLETE_AppPackProto app_pack = 14 [deprecated = true];
+  optional OBSOLETE_ForcedLogoutTimeoutsProto forced_logout_timeouts = 15
+      [deprecated = true];
+  optional OBSOLETE_ScreenSaverProto login_screen_saver = 16
+      [deprecated = true];
   optional AutoUpdateSettingsProto auto_update_settings = 17;
   optional StartUpUrlsProto start_up_urls = 18;
   optional PinnedAppsProto pinned_apps = 19;