Actually deprecate DeviceLocalAccountInfoProto.id

chrome/browser/chromeos/settings/device_settings_provider.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/settings/device_settings_provider.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 477 matching lines @@
         if (entry->kiosk_app().has_app_id()) {
           entry_dict->SetStringWithoutPathExpansion(
               kAccountsPrefDeviceLocalAccountsKeyKioskAppId,
               entry->kiosk_app().app_id());
         }
         if (entry->kiosk_app().has_update_url()) {
           entry_dict->SetStringWithoutPathExpansion(
               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(
-            kAccountsPrefDeviceLocalAccountsKeyId, entry->id());
+            kAccountsPrefDeviceLocalAccountsKeyId,
+            entry->deprecated_public_session_id());
         entry_dict->SetIntegerWithoutPathExpansion(
             kAccountsPrefDeviceLocalAccountsKeyType,
             DEVICE_LOCAL_ACCOUNT_TYPE_PUBLIC_SESSION);
       }
       account_list->Append(entry_dict.release());
     }
   }
   new_values_cache->SetValue(kAccountsPrefDeviceLocalAccounts,
                              account_list.release());
 
@@ skipping 427 matching lines @@
 void DeviceSettingsProvider::AttemptMigration() {
   if (device_settings_service_->HasPrivateOwnerKey()) {
     PrefValueMap::const_iterator i;
     for (i = migration_values_.begin(); i != migration_values_.end(); ++i)
       DoSet(i->first, *i->second);
     migration_values_.Clear();
   }
 }
 
 }  // namespace chromeos