Actually deprecate DeviceLocalAccountInfoProto.id

Actually deprecate DeviceLocalAccountInfoProto.id

I made the original device policy change without the rename for
backwards compatibility. This commit now does the rename.

BUG=chromium:216359
TEST=compiles and passes tests

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=198697

[Mattias Nissler (ping if slow), 2013-05-06 12:54:33]

I broke this part out of the original commit that you already LGTMed ;) Now I
want to go through renaming hell, so please review this.

[Joao da Silva, 2013-05-06 13:00:07]

lgtm

https://codereview.chromium.org/14885008/diff/1/chrome/browser/policy/proto/c...
File chrome/browser/policy/proto/chromeos/chrome_device_policy.proto (right):

https://codereview.chromium.org/14885008/diff/1/chrome/browser/policy/proto/c...
chrome/browser/policy/proto/chromeos/chrome_device_policy.proto:248: //
TODO(mnissler): Rename this field to indicate it's deprecated.
Remove the TODO

[Mattias Nissler (ping if slow), 2013-05-06 13:40:33]

https://codereview.chromium.org/14885008/diff/1/chrome/browser/policy/proto/c...
File chrome/browser/policy/proto/chromeos/chrome_device_policy.proto (right):

https://codereview.chromium.org/14885008/diff/1/chrome/browser/policy/proto/c...
chrome/browser/policy/proto/chromeos/chrome_device_policy.proto:248: //
TODO(mnissler): Rename this field to indicate it's deprecated.
On 2013/05/06 13:00:08, Joao da Silva wrote:
> Remove the TODO

Done.

[commit-bot: I haz the power, 2013-05-06 13:40:45]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mnissler@chromium.org/14885008/5001

[commit-bot: I haz the power, 2013-05-06 13:40:48]

Failed to apply patch for
chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
  Hunk #1 FAILED at 144.
  1 out of 1 hunk FAILED -- saving rejects to file
chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc.rej

Patch:       chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
Index: chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
diff --git a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
index
bc3066fc28a5f0d481753795ff52c25455378f3d..4122ff036588cdd8d63f8c5025bb0606b2d00a1a
100644
--- a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
+++ b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
@@ -144,10 +144,11 @@ void DecodeLoginPolicies(const
em::ChromeDeviceSettingsProto& policy,
                 chromeos::kAccountsPrefDeviceLocalAccountsKeyKioskAppUpdateURL,
                 entry->kiosk_app().update_url());
           }
-        } else if (entry->has_id()) {
+        } else if (entry->has_deprecated_public_session_id()) {
           // Deprecated public session specification.
           entry_dict->SetStringWithoutPathExpansion(
-              chromeos::kAccountsPrefDeviceLocalAccountsKeyId, entry->id());
+              chromeos::kAccountsPrefDeviceLocalAccountsKeyId,
+              entry->deprecated_public_session_id());
           entry_dict->SetIntegerWithoutPathExpansion(
               chromeos::kAccountsPrefDeviceLocalAccountsKeyType,
               chromeos::DEVICE_LOCAL_ACCOUNT_TYPE_PUBLIC_SESSION);

[commit-bot: I haz the power, 2013-05-07 12:26:23]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mnissler@chromium.org/14885008/11001

[Mattias Nissler (ping if slow), 2013-05-07 12:51:43]

Committed patchset #3 manually as r198697 (presubmit successful).