This CL replaces user_manager::UserID with AccountId.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 45 matching lines @@
 #include "chrome/browser/ui/apps/chrome_app_delegate.h"
 #include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/browser_status_monitor.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile_manager.h"
+#include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/fake_user_manager.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/app_window/app_window_contents.h"
 #include "extensions/browser/app_window/app_window_registry.h"
 #include "extensions/browser/app_window/native_app_window.h"
 #include "ui/aura/window.h"
 #endif
 
 #if defined(USE_AURA)
@@ skipping 725 matching lines @@
     // A Task is leaked if we don't destroy everything, then run the message
     // loop.
     base::MessageLoop::current()->PostTask(
         FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
     base::MessageLoop::current()->Run();
   }
 
   // Creates a profile for a given |user_name|. Note that this class will keep
   // the ownership of the created object.
   TestingProfile* CreateMultiUserProfile(const std::string& user_name) {
-    std::string email_string = user_name + "@example.com";
+    const std::string email_string = user_name + "@example.com";
+    const AccountId account_id(AccountId::FromUserEmail(email_string));
     static_cast<ash::test::TestSessionStateDelegate*>(
         ash::Shell::GetInstance()->session_state_delegate())
-        ->AddUser(email_string);
+        ->AddUser(account_id.GetUserEmail());
     // Add a user to the fake user manager.
-    session_delegate()->AddUser(email_string);
-    GetFakeUserManager()->AddUser(email_string);
+    session_delegate()->AddUser(account_id.GetUserEmail());
+    GetFakeUserManager()->AddUser(account_id);
 
-    GetFakeUserManager()->LoginUser(email_string);
+    GetFakeUserManager()->LoginUser(account_id);
 
     TestingProfile* profile =
-        profile_manager()->CreateTestingProfile(email_string);
+        profile_manager()->CreateTestingProfile(account_id.GetUserEmail());
     EXPECT_TRUE(profile);
 
     // Remember the profile name so that we can destroy it upon destruction.
-    created_profiles_[profile] = email_string;
+    created_profiles_[profile] = account_id.GetUserEmail();
     if (chrome::MultiUserWindowManager::GetInstance())
       chrome::MultiUserWindowManager::GetInstance()->AddUser(profile);
     if (launcher_controller_)
       launcher_controller_->AdditionalUserAddedToSession(profile);
     return profile;
   }
 
   // Switch to another user.
   void SwitchActiveUser(const std::string& name) {
-    session_delegate()->SwitchActiveUser(name);
-    GetFakeUserManager()->SwitchActiveUser(name);
+    const AccountId account_id(AccountId::FromUserEmail(name));
+    session_delegate()->SwitchActiveUser(account_id.GetUserEmail());
+    GetFakeUserManager()->SwitchActiveUser(account_id);
     chrome::MultiUserWindowManagerChromeOS* manager =
         static_cast<chrome::MultiUserWindowManagerChromeOS*>(
             chrome::MultiUserWindowManager::GetInstance());
     manager->SetAnimationSpeedForTest(
         chrome::MultiUserWindowManagerChromeOS::ANIMATION_SPEED_DISABLED);
-    manager->ActiveUserChanged(name);
-    launcher_controller_->browser_status_monitor_for_test()->
-        ActiveUserChanged(name);
-    launcher_controller_->app_window_controller_for_test()->
-        ActiveUserChanged(name);
+    manager->ActiveUserChanged(account_id.GetUserEmail());
+    launcher_controller_->browser_status_monitor_for_test()->ActiveUserChanged(
+        account_id.GetUserEmail());
+    launcher_controller_->app_window_controller_for_test()->ActiveUserChanged(
+        account_id.GetUserEmail());
   }
 
   // Creates a browser with a |profile| and load a tab with a |title| and |url|.
   scoped_ptr<Browser> CreateBrowserAndTabWithProfile(Profile* profile,
                                                      const std::string& title,
                                                      const std::string& url) {
     scoped_ptr<Browser> browser(CreateBrowserWithTestWindowForProfile(profile));
     chrome::NewTab(browser.get());
 
     browser->window()->Show();
@@ skipping 1815 matching lines @@
 
   EXPECT_EQ(1, app_icon_loader->fetch_count());
   ASSERT_EQ(initial_size + 1, model_->items().size());
   EXPECT_TRUE(launcher_controller_->IsAppPinned("1"));
   EXPECT_FALSE(launcher_controller_->IsAppPinned("0"));
   EXPECT_EQ(ash::TYPE_APP_SHORTCUT, model_->items()[app_index].type);
 
   launcher_controller_->UnpinAppWithID("1");
   ASSERT_EQ(initial_size, model_->items().size());
 }