OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/shell.h" | 5 #include "ash/shell.h" |
6 #include "ash/test/ash_test_base.h" | 6 #include "ash/test/ash_test_base.h" |
7 #include "ash/test/test_session_state_delegate.h" | 7 #include "ash/test/test_session_state_delegate.h" |
8 #include "ash/test/test_shell_delegate.h" | 8 #include "ash/test/test_shell_delegate.h" |
9 #include "ash/wm/window_state.h" | 9 #include "ash/wm/window_state.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
211 CommandLine::ForCurrentProcess()->AppendSwitch(switches::kMultiProfiles); | 211 CommandLine::ForCurrentProcess()->AppendSwitch(switches::kMultiProfiles); |
212 AshTestBase::SetUp(); | 212 AshTestBase::SetUp(); |
213 session_state_delegate_ = | 213 session_state_delegate_ = |
214 static_cast<ash::test::TestSessionStateDelegate*> ( | 214 static_cast<ash::test::TestSessionStateDelegate*> ( |
215 ash::Shell::GetInstance()->session_state_delegate()); | 215 ash::Shell::GetInstance()->session_state_delegate()); |
216 fake_user_manager()->AddUser(kTestAccount1); | 216 fake_user_manager()->AddUser(kTestAccount1); |
217 fake_user_manager()->AddUser(kTestAccount2); | 217 fake_user_manager()->AddUser(kTestAccount2); |
218 } | 218 } |
219 | 219 |
220 void WallpaperPrivateApiMultiUserUnittest::TearDown() { | 220 void WallpaperPrivateApiMultiUserUnittest::TearDown() { |
| 221 chrome::MultiUserWindowManager::DeleteInstance(); |
221 AshTestBase::TearDown(); | 222 AshTestBase::TearDown(); |
222 chrome::MultiUserWindowManager::DeleteInstance(); | |
223 } | 223 } |
224 | 224 |
225 void WallpaperPrivateApiMultiUserUnittest::SetUpMultiUserWindowManager( | 225 void WallpaperPrivateApiMultiUserUnittest::SetUpMultiUserWindowManager( |
226 const std::string& active_user_id, | 226 const std::string& active_user_id, |
227 chrome::MultiUserWindowManager::MultiProfileMode mode) { | 227 chrome::MultiUserWindowManager::MultiProfileMode mode) { |
228 multi_user_window_manager_ = | 228 multi_user_window_manager_ = |
229 new chrome::MultiUserWindowManagerChromeOS(active_user_id); | 229 new chrome::MultiUserWindowManagerChromeOS(active_user_id); |
230 chrome::MultiUserWindowManager::SetInstanceForTest( | 230 chrome::MultiUserWindowManager::SetInstanceForTest( |
231 multi_user_window_manager_, mode); | 231 multi_user_window_manager_, mode); |
232 EXPECT_TRUE(multi_user_window_manager_); | 232 EXPECT_TRUE(multi_user_window_manager_); |
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
393 scoped_refptr<TestRestoreFunction> restore_function_1( | 393 scoped_refptr<TestRestoreFunction> restore_function_1( |
394 new TestRestoreFunction()); | 394 new TestRestoreFunction()); |
395 EXPECT_TRUE(restore_function_1->RunImpl()); | 395 EXPECT_TRUE(restore_function_1->RunImpl()); |
396 | 396 |
397 EXPECT_FALSE(window1_state->IsMinimized()); | 397 EXPECT_FALSE(window1_state->IsMinimized()); |
398 EXPECT_FALSE(window2_state->IsMinimized()); | 398 EXPECT_FALSE(window2_state->IsMinimized()); |
399 EXPECT_FALSE(window3_state->IsMinimized()); | 399 EXPECT_FALSE(window3_state->IsMinimized()); |
400 } | 400 } |
401 | 401 |
402 } // namespace chromeos | 402 } // namespace chromeos |
OLD | NEW |