This CL replaces user_manager::UserID with AccountId.

chrome/browser/signin/easy_unlock_service_unittest_chromeos.cc

 // Copyright 2015 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 <map>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/users/mock_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/signin/easy_unlock_app_manager.h"
 #include "chrome/browser/signin/easy_unlock_service.h"
 #include "chrome/browser/signin/easy_unlock_service_factory.h"
 #include "chrome/browser/signin/easy_unlock_service_regular.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_power_manager_client.h"
+#include "components/signin/core/account_id/account_id.h"
 #include "components/signin/core/browser/signin_manager_base.h"
 #include "components/syncable_prefs/testing_pref_service_syncable.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/test/mock_bluetooth_adapter.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using chromeos::DBusThreadManagerSetter;
 using chromeos::FakePowerManagerClient;
 using chromeos::PowerManagerClient;
@@ skipping 177 matching lines @@
     power_manager_client_ = new FakePowerManagerClient;
     dbus_setter->SetPowerManagerClient(
         scoped_ptr<PowerManagerClient>(power_manager_client_));
 
     ON_CALL(*mock_user_manager_, Shutdown()).WillByDefault(Return());
     ON_CALL(*mock_user_manager_, IsLoggedInAsUserWithGaiaAccount())
         .WillByDefault(Return(true));
     ON_CALL(*mock_user_manager_, IsCurrentUserNonCryptohomeDataEphemeral())
         .WillByDefault(Return(false));
 
-    SetUpProfile(&profile_, kTestUserPrimary);
+    SetUpProfile(&profile_, AccountId::FromUserEmail(kTestUserPrimary));
   }
 
   void TearDown() override {
     delete app_manager_factory;
     app_manager_factory = NULL;
   }
 
   void SetEasyUnlockAllowedPolicy(bool allowed) {
     profile_->GetTestingPrefService()->SetManagedPref(
         prefs::kEasyUnlockAllowed, new base::FundamentalValue(allowed));
@@ skipping 23 matching lines @@
   }
 
   void SetAppManagerReady(content::BrowserContext* context) {
     ASSERT_TRUE(app_manager_factory);
     TestAppManager* app_manager = app_manager_factory->Find(context);
     ASSERT_TRUE(app_manager);
     app_manager->SetReady();
   }
 
   void SetUpSecondaryProfile() {
-    SetUpProfile(&secondary_profile_, kTestUserSecondary);
+    SetUpProfile(&secondary_profile_,
+                 AccountId::FromUserEmail(kTestUserSecondary));
   }
 
  private:
   // Sets up a test profile with a user id.
   void SetUpProfile(scoped_ptr<TestingProfile>* profile,
-                    const std::string& user_id) {
+                    const AccountId& account_id) {
     ASSERT_TRUE(profile);
     ASSERT_FALSE(profile->get());
 
     TestingProfile::Builder builder;
     builder.AddTestingFactory(EasyUnlockServiceFactory::GetInstance(),
                               &CreateEasyUnlockServiceForTest);
     *profile = builder.Build();
 
-    mock_user_manager_->AddUser(user_id);
-    profile->get()->set_profile_name(user_id);
+    mock_user_manager_->AddUser(account_id);
+    profile->get()->set_profile_name(account_id.GetUserEmail());
 
     SigninManagerBase* signin_manager =
         SigninManagerFactory::GetForProfile(profile->get());
-    signin_manager->SetAuthenticatedAccountInfo(user_id, user_id);
+    signin_manager->SetAuthenticatedAccountInfo(account_id.GetUserEmail(),
+                                                account_id.GetUserEmail());
   }
 
  protected:
   scoped_ptr<TestingProfile> profile_;
   scoped_ptr<TestingProfile> secondary_profile_;
   chromeos::MockUserManager* mock_user_manager_;
 
  private:
   content::TestBrowserThreadBundle thread_bundle_;
 
@@ skipping 67 matching lines @@
   ON_CALL(*mock_user_manager_, IsCurrentUserNonCryptohomeDataEphemeral())
       .WillByDefault(Return(true));
 
   SetAppManagerReady(profile_.get());
   EXPECT_FALSE(EasyUnlockService::Get(profile_.get())->IsAllowed());
   EXPECT_TRUE(
       EasyUnlockAppInState(profile_.get(), TestAppManager::STATE_NOT_LOADED));
 }
 
 }  // namespace