This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc

 // Copyright 2013 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 <string>
 
 #include "base/message_loop/message_loop.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/ui/mock_login_display.h"
@@ skipping 24 matching lines @@
 // delay the test.
 const int kAutoLoginDelay1 = 60000;
 const int kAutoLoginDelay2 = 180000;
 
 }  // namespace
 
 class ExistingUserControllerAutoLoginTest : public ::testing::Test {
  protected:
   ExistingUserControllerAutoLoginTest()
       : auto_login_user_id_(policy::GenerateDeviceLocalAccountUserId(
             kAutoLoginAccountId,

[achuithb, 2015/10/23 00:08:49]

Does this need to be changed as well?

[Alexander Alekseev, 2015/10/23 09:11:21]

Done.

             policy::DeviceLocalAccount::TYPE_PUBLIC_SESSION)),
         ui_thread_(content::BrowserThread::UI, &message_loop_),
         local_state_(TestingBrowserProcess::GetGlobal()),
         mock_user_manager_(new MockUserManager()),
         scoped_user_manager_(mock_user_manager_) {
   }
 
   void SetUp() override {
     mock_login_display_host_.reset(new MockLoginDisplayHost);
     mock_login_display_ = new MockLoginDisplay();
 
     EXPECT_CALL(*mock_login_display_host_.get(), CreateLoginDisplay(_))
         .Times(1)
         .WillOnce(Return(mock_login_display_));
 
     EXPECT_CALL(*mock_user_manager_, Shutdown()).Times(AnyNumber());
     EXPECT_CALL(*mock_user_manager_, FindUser(_))
         .WillRepeatedly(ReturnNull());
-    EXPECT_CALL(*mock_user_manager_, FindUser(auto_login_user_id_))
-        .WillRepeatedly(Return(
-            mock_user_manager_->CreatePublicAccountUser(auto_login_user_id_)));
+    EXPECT_CALL(*mock_user_manager_,
+                FindUser(AccountId::FromUserEmail(auto_login_user_id_)))
+        .WillRepeatedly(Return(mock_user_manager_->CreatePublicAccountUser(
+            AccountId::FromUserEmail(auto_login_user_id_))));
 
     existing_user_controller_.reset(
         new ExistingUserController(mock_login_display_host_.get()));
 
     scoped_ptr<base::DictionaryValue> account(new base::DictionaryValue);
     account->SetStringWithoutPathExpansion(
         kAccountsPrefDeviceLocalAccountsKeyId,
         kAutoLoginAccountId);

[achuithb, 2015/10/23 00:08:49]

and here?

[Alexander Alekseev, 2015/10/23 09:11:21]

Done.

     account->SetIntegerWithoutPathExpansion(
         kAccountsPrefDeviceLocalAccountsKeyType,
         policy::DeviceLocalAccount::TYPE_PUBLIC_SESSION);
     base::ListValue accounts;
     accounts.Append(account.release());
     CrosSettings::Get()->Set(kAccountsPrefDeviceLocalAccounts, accounts);
 
     // Prevent settings changes from auto-starting the timer.
     existing_user_controller_->
         local_account_auto_login_id_subscription_.reset();
     existing_user_controller_->
         local_account_auto_login_delay_subscription_.reset();
   }
 
   const ExistingUserController* existing_user_controller() const {
     return ExistingUserController::current_controller();
   }
 
   ExistingUserController* existing_user_controller() {
     return ExistingUserController::current_controller();
   }
 
   void SetAutoLoginSettings(const std::string& account_id, int delay) {

[achuithb, 2015/10/23 00:08:49]

here too?

[Alexander Alekseev, 2015/10/23 09:11:21]

Done.

     CrosSettings::Get()->SetString(
         kAccountsPrefDeviceLocalAccountAutoLoginId,
         account_id);
     CrosSettings::Get()->SetInteger(
         kAccountsPrefDeviceLocalAccountAutoLoginDelay,
         delay);
   }
 
   // ExistingUserController private member accessors.
   base::OneShotTimer* auto_login_timer() {
@@ skipping 160 matching lines @@
   ConfigureAutoLogin();
   ASSERT_TRUE(auto_login_timer());
   EXPECT_FALSE(auto_login_timer()->IsRunning());
   EXPECT_EQ(auto_login_timer()->GetCurrentDelay().InMilliseconds(),
             kAutoLoginDelay2);
   EXPECT_EQ(auto_login_username(), "");
   EXPECT_EQ(auto_login_delay(), kAutoLoginDelay2);
 }
 
 }  // namespace chromeos