This CL replaces user_manager::UserID 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"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/extensions/wallpaper_private_api.h"
 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.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 "components/signin/core/account_id/account_id.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 
 namespace chromeos {
 namespace {
 
 const char kTestAccount1[] = "user1@test.com";
 const char kTestAccount2[] = "user2@test.com";
 
 class WallpaperPrivateApiUnittest : public ash::test::AshTestBase {
  public:
   WallpaperPrivateApiUnittest()
-      : fake_user_manager_(new FakeChromeUserManager()),
+      : test_account1_(AccountId::FromUserEmail(kTestAccount1)),
+        test_account2_(AccountId::FromUserEmail(kTestAccount2)),
+        fake_user_manager_(new FakeChromeUserManager()),
         scoped_user_manager_(fake_user_manager_) {}
 
  protected:
   FakeChromeUserManager* fake_user_manager() { return fake_user_manager_; }
 
+  const AccountId test_account1_;

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

Use in-class member initialization

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

Done.

+  const AccountId test_account2_;
+
  private:
   FakeChromeUserManager* fake_user_manager_;
   ScopedUserManagerEnabler scoped_user_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(WallpaperPrivateApiUnittest);
 };
 
 class TestMinimizeFunction
     : public WallpaperPrivateMinimizeInactiveWindowsFunction {
  public:
@@ skipping 15 matching lines @@
   bool RunAsync() override {
     return WallpaperPrivateRestoreMinimizedWindowsFunction::RunAsync();
   }
  protected:
   ~TestRestoreFunction() override {}
 };
 
 }  // namespace
 
 TEST_F(WallpaperPrivateApiUnittest, HideAndRestoreWindows) {
-  fake_user_manager()->AddUser(kTestAccount1);
+  fake_user_manager()->AddUser(test_account1_);
   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());
@@ skipping 42 matching lines @@
   EXPECT_TRUE(window3_state->IsMinimized());
   EXPECT_TRUE(window4_state->IsMinimized());
 }
 
 // Test for multiple calls to |MinimizeInactiveWindows| before call
 // |RestoreWindows|:
 // 1. If all window hasn't change their states, the following calls are noops.
 // 2. If some windows are manually unminimized, the following call will minimize
 // all the unminimized windows.
 TEST_F(WallpaperPrivateApiUnittest, HideAndManualUnminimizeWindows) {
-  fake_user_manager()->AddUser(kTestAccount1);
+  fake_user_manager()->AddUser(test_account1_);
   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());
 
   // We then activate window 0 (i.e. wallpaper picker) and call the minimize
   // function.
   window0_state->Activate();
   EXPECT_TRUE(window0_state->IsActive());
@@ skipping 43 matching lines @@
  public:
   WallpaperPrivateApiMultiUserUnittest()
       : multi_user_window_manager_(NULL),
         session_state_delegate_(NULL) {}
 
   void SetUp() override;
   void TearDown() override;
 
  protected:
   void SetUpMultiUserWindowManager(
-      const std::string& active_user_id,
+      const AccountId& active_user_id,
       chrome::MultiUserWindowManager::MultiProfileMode mode);
 
-  void SwitchActiveUser(const std::string& active_user_id);
+  void SwitchActiveUser(const AccountId& active_user_id);

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

active_account_id

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

Done.

 
   chrome::MultiUserWindowManagerChromeOS* multi_user_window_manager() {
     return multi_user_window_manager_;
   }
 
  private:
   chrome::MultiUserWindowManagerChromeOS* multi_user_window_manager_;
   ash::test::TestSessionStateDelegate* session_state_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(WallpaperPrivateApiMultiUserUnittest);
 };
 
 void WallpaperPrivateApiMultiUserUnittest::SetUp() {
   AshTestBase::SetUp();
   WallpaperManager::Initialize();
   session_state_delegate_ =
       static_cast<ash::test::TestSessionStateDelegate*> (
           ash::Shell::GetInstance()->session_state_delegate());
-  fake_user_manager()->AddUser(kTestAccount1);
-  fake_user_manager()->AddUser(kTestAccount2);
+  fake_user_manager()->AddUser(test_account1_);
+  fake_user_manager()->AddUser(test_account2_);
 }
 
 void WallpaperPrivateApiMultiUserUnittest::TearDown() {
   chrome::MultiUserWindowManager::DeleteInstance();
   AshTestBase::TearDown();
   WallpaperManager::Shutdown();
 }
 
 void WallpaperPrivateApiMultiUserUnittest::SetUpMultiUserWindowManager(
-    const std::string& active_user_id,
+    const AccountId& active_user_id,

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

active_account_id

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

Done.

     chrome::MultiUserWindowManager::MultiProfileMode mode) {
   multi_user_window_manager_ =
-      new chrome::MultiUserWindowManagerChromeOS(active_user_id);
+      new chrome::MultiUserWindowManagerChromeOS(active_user_id.GetUserEmail());
   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 std::string& active_user_id) {
+    const AccountId& active_user_id) {

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

active_account_id

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

Done.

   fake_user_manager()->SwitchActiveUser(active_user_id);
-  multi_user_window_manager_->ActiveUserChanged(active_user_id);
+  multi_user_window_manager_->ActiveUserChanged(active_user_id.GetUserEmail());
 }
 
 // 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(kTestAccount1,
+  SetUpMultiUserWindowManager(
+      test_account1_,
       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(), kTestAccount1);
-  multi_user_window_manager()->SetWindowOwner(window1.get(), kTestAccount1);
+  multi_user_window_manager()->SetWindowOwner(window0.get(),
+                                              test_account1_.GetUserEmail());
+  multi_user_window_manager()->SetWindowOwner(window1.get(),
+                                              test_account1_.GetUserEmail());
 
   // Set some windows to an inactive owner.
-  multi_user_window_manager()->SetWindowOwner(window2.get(), kTestAccount2);
-  multi_user_window_manager()->SetWindowOwner(window3.get(), kTestAccount2);
-  multi_user_window_manager()->SetWindowOwner(window4.get(), kTestAccount2);
+  multi_user_window_manager()->SetWindowOwner(window2.get(),
+                                              test_account2_.GetUserEmail());
+  multi_user_window_manager()->SetWindowOwner(window3.get(),
+                                              test_account2_.GetUserEmail());
+  multi_user_window_manager()->SetWindowOwner(window4.get(),
+                                              test_account2_.GetUserEmail());
 
   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();
   EXPECT_TRUE(window0_state->IsActive());
   scoped_refptr<TestMinimizeFunction> minimize_function_0(
       new TestMinimizeFunction());
   EXPECT_TRUE(minimize_function_0->RunAsync());
 
   // All windows except window 0 should be minimized.
   EXPECT_FALSE(window0_state->IsMinimized());
   EXPECT_TRUE(window1_state->IsMinimized());
 
   // All windows that belong to inactive user should not be affected.
   EXPECT_FALSE(window2_state->IsMinimized());
   EXPECT_FALSE(window3_state->IsMinimized());
   EXPECT_FALSE(window4_state->IsMinimized());
 
   // Activate kTestAccount2. kTestAccount1 becomes inactive user.
-  SwitchActiveUser(kTestAccount2);
+  SwitchActiveUser(test_account2_);
 
   window2_state->Activate();
   EXPECT_TRUE(window2_state->IsActive());
   scoped_refptr<TestMinimizeFunction> minimize_function_1(
       new TestMinimizeFunction());
   EXPECT_TRUE(minimize_function_1->RunAsync());
 
   // All windows except window 2 should be minimized.
   EXPECT_FALSE(window2_state->IsMinimized());
   EXPECT_TRUE(window3_state->IsMinimized());
@@ skipping 17 matching lines @@
   scoped_refptr<TestRestoreFunction> restore_function_0(
       new TestRestoreFunction());
   EXPECT_TRUE(restore_function_0->RunAsync());
 
   EXPECT_FALSE(window3_state->IsMinimized());
 
   // All windows that belong to inactive user should not be affected.
   EXPECT_FALSE(window0_state->IsMinimized());
   EXPECT_TRUE(window1_state->IsMinimized());
 
-  SwitchActiveUser(kTestAccount1);
+  SwitchActiveUser(test_account1_);
 
   // Then we destroy window 0 and call the restore function.
   window0.reset();
   scoped_refptr<TestRestoreFunction> restore_function_1(
       new TestRestoreFunction());
   EXPECT_TRUE(restore_function_1->RunAsync());
 
   EXPECT_FALSE(window1_state->IsMinimized());
   EXPECT_FALSE(window3_state->IsMinimized());
 }
 
 // In multi profile mode, user may teleport windows. Teleported window should
 // also be minimized when open wallpaper picker.
 TEST_F(WallpaperPrivateApiMultiUserUnittest, HideTeleportedWindow) {
-  SetUpMultiUserWindowManager(kTestAccount1,
+  SetUpMultiUserWindowManager(
+      AccountId::FromUserEmail(kTestAccount1),
       chrome::MultiUserWindowManager::MULTI_PROFILE_MODE_MIXED);
 
   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(), kTestAccount1);
-  multi_user_window_manager()->SetWindowOwner(window1.get(), kTestAccount1);
+  multi_user_window_manager()->SetWindowOwner(window0.get(),
+                                              test_account1_.GetUserEmail());
+  multi_user_window_manager()->SetWindowOwner(window1.get(),
+                                              test_account1_.GetUserEmail());
 
   // Set some windows to an inactive owner.
-  multi_user_window_manager()->SetWindowOwner(window2.get(), kTestAccount2);
-  multi_user_window_manager()->SetWindowOwner(window3.get(), kTestAccount2);
+  multi_user_window_manager()->SetWindowOwner(window2.get(),
+                                              test_account2_.GetUserEmail());
+  multi_user_window_manager()->SetWindowOwner(window3.get(),
+                                              test_account2_.GetUserEmail());
 
   // Teleport window2 to kTestAccount1.
-  multi_user_window_manager()->ShowWindowForUser(window2.get(), kTestAccount1);
+  multi_user_window_manager()->ShowWindowForUser(window2.get(),
+                                                 test_account1_.GetUserEmail());
 
   // 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