Actually deprecate DeviceLocalAccountInfoProto.id

chrome/browser/chromeos/policy/device_local_account_policy_service.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_local_account_policy_service.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "chrome/browser/chromeos/policy/device_local_account_policy_store.h"
 #include "chrome/browser/policy/cloud/cloud_policy_client.h"
@@ skipping 153 matching lines @@
   PolicyBrokerMap new_policy_brokers;
   const RepeatedPtrField<em::DeviceLocalAccountInfoProto>& accounts =
       device_settings.device_local_accounts().account();
   RepeatedPtrField<em::DeviceLocalAccountInfoProto>::const_iterator entry;
   for (entry = accounts.begin(); entry != accounts.end(); ++entry) {
     std::string account_id;
     if (entry->has_type() &&
         entry->type() ==
             em::DeviceLocalAccountInfoProto::ACCOUNT_TYPE_PUBLIC_SESSION) {
       account_id = entry->account_id();
-    } else if (entry->has_id()) {
-      account_id = entry->id();
+    } else if (entry->has_deprecated_public_session_id()) {
+      account_id = entry->deprecated_public_session_id();
     }
 
     if (account_id.empty())
       continue;
 
     // Sanity check for whether this account ID has already been processed.
     DeviceLocalAccountPolicyBroker*& new_broker =
         new_policy_brokers[account_id];
     if (new_broker) {
       LOG(WARNING) << "Duplicate public account " << account_id;
@@ skipping 73 matching lines @@
   scoped_ptr<CloudPolicyClient> client(
       new CloudPolicyClient(std::string(), std::string(),
                             USER_AFFILIATION_MANAGED,
                             NULL, device_management_service_));
   client->SetupRegistration(policy_data->request_token(),
                             policy_data->device_id());
   return client.Pass();
 }
 
 }  // namespace policy