Actually deprecate DeviceLocalAccountInfoProto.id

chrome/browser/chromeos/policy/device_policy_decoder_chromeos.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 "chrome/browser/chromeos/policy/device_policy_decoder_chromeos.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "base/values.h"
@@ skipping 126 matching lines @@
           if (entry->kiosk_app().has_app_id()) {
             entry_dict->SetStringWithoutPathExpansion(
                 chromeos::kAccountsPrefDeviceLocalAccountsKeyKioskAppId,
                 entry->kiosk_app().app_id());
           }
           if (entry->kiosk_app().has_update_url()) {
             entry_dict->SetStringWithoutPathExpansion(
                 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);
         }
         account_list->Append(entry_dict.release());
       }
       policies->Set(key::kDeviceLocalAccounts,
                     POLICY_LEVEL_MANDATORY,
                     POLICY_SCOPE_MACHINE,
                     account_list.release());
@@ skipping 365 matching lines @@
   // Decode the various groups of policies.
   DecodeLoginPolicies(policy, policies);
   DecodeKioskPolicies(policy, policies, install_attributes);
   DecodeNetworkPolicies(policy, policies, install_attributes);
   DecodeReportingPolicies(policy, policies);
   DecodeAutoUpdatePolicies(policy, policies);
   DecodeGenericPolicies(policy, policies);
 }
 
 }  // namespace policy