This CL replaces std::string user_id in ash/* with AccountId.

chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.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 "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_session_state_delegate.h"
 #include "ash/test/test_shell_delegate.h"
 #include "ash/wm/window_state.h"
 #include "base/command_line.h"
@@ skipping 217 matching lines @@
 
 void WallpaperPrivateApiMultiUserUnittest::TearDown() {
   chrome::MultiUserWindowManager::DeleteInstance();
   AshTestBase::TearDown();
   WallpaperManager::Shutdown();
 }
 
 void WallpaperPrivateApiMultiUserUnittest::SetUpMultiUserWindowManager(
     const AccountId& active_account_id,
     chrome::MultiUserWindowManager::MultiProfileMode mode) {
-  multi_user_window_manager_ = new chrome::MultiUserWindowManagerChromeOS(
-      active_account_id.GetUserEmail());
+  multi_user_window_manager_ =
+      new chrome::MultiUserWindowManagerChromeOS(active_account_id);
   multi_user_window_manager_->Init();
   chrome::MultiUserWindowManager::SetInstanceForTest(
       multi_user_window_manager_, mode);
   // We do not want animations while the test is going on.
   multi_user_window_manager_->SetAnimationSpeedForTest(
       chrome::MultiUserWindowManagerChromeOS::ANIMATION_SPEED_DISABLED);
   EXPECT_TRUE(multi_user_window_manager_);
 }
 
 void WallpaperPrivateApiMultiUserUnittest::SwitchActiveUser(
     const AccountId& active_account_id) {
   fake_user_manager()->SwitchActiveUser(active_account_id);
-  multi_user_window_manager_->ActiveUserChanged(
-      active_account_id.GetUserEmail());
+  multi_user_window_manager_->ActiveUserChanged(active_account_id);
 }
 
 // In multi profile mode, user may open wallpaper picker in one profile and
 // then switch to a different profile and open another wallpaper picker
 // without closing the first one.
 TEST_F(WallpaperPrivateApiMultiUserUnittest, HideAndRestoreWindowsTwoUsers) {
   SetUpMultiUserWindowManager(
       test_account_id1_,
       chrome::MultiUserWindowManager::MULTI_PROFILE_MODE_SEPARATED);
 
   scoped_ptr<aura::Window> window4(CreateTestWindowInShellWithId(4));
   scoped_ptr<aura::Window> window3(CreateTestWindowInShellWithId(3));
   scoped_ptr<aura::Window> window2(CreateTestWindowInShellWithId(2));
   scoped_ptr<aura::Window> window1(CreateTestWindowInShellWithId(1));
   scoped_ptr<aura::Window> window0(CreateTestWindowInShellWithId(0));
 
   ash::wm::WindowState* window0_state = ash::wm::GetWindowState(window0.get());
   ash::wm::WindowState* window1_state = ash::wm::GetWindowState(window1.get());
   ash::wm::WindowState* window2_state = ash::wm::GetWindowState(window2.get());
   ash::wm::WindowState* window3_state = ash::wm::GetWindowState(window3.get());
   ash::wm::WindowState* window4_state = ash::wm::GetWindowState(window4.get());
 
-  multi_user_window_manager()->SetWindowOwner(window0.get(),
-                                              test_account_id1_.GetUserEmail());
-  multi_user_window_manager()->SetWindowOwner(window1.get(),
-                                              test_account_id1_.GetUserEmail());
+  multi_user_window_manager()->SetWindowOwner(window0.get(), test_account_id1_);
+  multi_user_window_manager()->SetWindowOwner(window1.get(), test_account_id1_);
 
   // Set some windows to an inactive owner.
-  multi_user_window_manager()->SetWindowOwner(window2.get(),
-                                              test_account_id2_.GetUserEmail());
-  multi_user_window_manager()->SetWindowOwner(window3.get(),
-                                              test_account_id2_.GetUserEmail());
-  multi_user_window_manager()->SetWindowOwner(window4.get(),
-                                              test_account_id2_.GetUserEmail());
+  multi_user_window_manager()->SetWindowOwner(window2.get(), test_account_id2_);
+  multi_user_window_manager()->SetWindowOwner(window3.get(), test_account_id2_);
+  multi_user_window_manager()->SetWindowOwner(window4.get(), test_account_id2_);
 
   EXPECT_FALSE(window0_state->IsMinimized());
   EXPECT_FALSE(window1_state->IsMinimized());
   EXPECT_FALSE(window2_state->IsMinimized());
   EXPECT_FALSE(window3_state->IsMinimized());
   EXPECT_FALSE(window4_state->IsMinimized());
 
   // We then activate window 0 (i.e. wallpaper picker) and call the minimize
   // function.
   window0_state->Activate();
@@ skipping 72 matching lines @@
   scoped_ptr<aura::Window> window3(CreateTestWindowInShellWithId(3));
   scoped_ptr<aura::Window> window2(CreateTestWindowInShellWithId(2));
   scoped_ptr<aura::Window> window1(CreateTestWindowInShellWithId(1));
   scoped_ptr<aura::Window> window0(CreateTestWindowInShellWithId(0));
 
   ash::wm::WindowState* window0_state = ash::wm::GetWindowState(window0.get());
   ash::wm::WindowState* window1_state = ash::wm::GetWindowState(window1.get());
   ash::wm::WindowState* window2_state = ash::wm::GetWindowState(window2.get());
   ash::wm::WindowState* window3_state = ash::wm::GetWindowState(window3.get());
 
-  multi_user_window_manager()->SetWindowOwner(window0.get(),
-                                              test_account_id1_.GetUserEmail());
-  multi_user_window_manager()->SetWindowOwner(window1.get(),
-                                              test_account_id1_.GetUserEmail());
+  multi_user_window_manager()->SetWindowOwner(window0.get(), test_account_id1_);
+  multi_user_window_manager()->SetWindowOwner(window1.get(), test_account_id1_);
 
   // Set some windows to an inactive owner.
-  multi_user_window_manager()->SetWindowOwner(window2.get(),
-                                              test_account_id2_.GetUserEmail());
-  multi_user_window_manager()->SetWindowOwner(window3.get(),
-                                              test_account_id2_.GetUserEmail());
+  multi_user_window_manager()->SetWindowOwner(window2.get(), test_account_id2_);
+  multi_user_window_manager()->SetWindowOwner(window3.get(), test_account_id2_);
 
   // Teleport window2 to kTestAccount1.
-  multi_user_window_manager()->ShowWindowForUser(
-      window2.get(), test_account_id1_.GetUserEmail());
+  multi_user_window_manager()->ShowWindowForUser(window2.get(),
+                                                 test_account_id1_);
 
   // Initial window state. All windows shouldn't be minimized.
   EXPECT_FALSE(window0_state->IsMinimized());
   EXPECT_FALSE(window1_state->IsMinimized());
   EXPECT_FALSE(window2_state->IsMinimized());
   EXPECT_FALSE(window3_state->IsMinimized());
 
   // We then activate window 0 (i.e. wallpaper picker) and call the minimize
   // function.
   window0_state->Activate();
@@ skipping 16 matching lines @@
   scoped_refptr<TestRestoreFunction> restore_function_1(
       new TestRestoreFunction());
   EXPECT_TRUE(restore_function_1->RunAsync());
 
   EXPECT_FALSE(window1_state->IsMinimized());
   EXPECT_FALSE(window2_state->IsMinimized());
   EXPECT_FALSE(window3_state->IsMinimized());
 }
 
 }  // namespace chromeos