Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(166)

Side by Side Diff: chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc

Issue 232133003: Fixing too long running unit tests on valgrind (produced by user switch animation) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: self nit Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/chromeos/preferences_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 // We do not want animations while the test is going on. 232 // We do not want animations while the test is going on.
233 multi_user_window_manager_->SetAnimationsForTest(true); 233 multi_user_window_manager_->SetAnimationSpeedForTest(
234 chrome::MultiUserWindowManagerChromeOS::ANIMATION_SPEED_DISABLED);
234 EXPECT_TRUE(multi_user_window_manager_); 235 EXPECT_TRUE(multi_user_window_manager_);
235 } 236 }
236 237
237 void WallpaperPrivateApiMultiUserUnittest::SwitchActiveUser( 238 void WallpaperPrivateApiMultiUserUnittest::SwitchActiveUser(
238 const std::string& active_user_id) { 239 const std::string& active_user_id) {
239 fake_user_manager()->SwitchActiveUser(active_user_id); 240 fake_user_manager()->SwitchActiveUser(active_user_id);
240 multi_user_window_manager_->ActiveUserChanged(active_user_id); 241 multi_user_window_manager_->ActiveUserChanged(active_user_id);
241 } 242 }
242 243
243 // In multi profile mode, user may open wallpaper picker in one profile and 244 // In multi profile mode, user may open wallpaper picker in one profile and
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 scoped_refptr<TestRestoreFunction> restore_function_1( 396 scoped_refptr<TestRestoreFunction> restore_function_1(
396 new TestRestoreFunction()); 397 new TestRestoreFunction());
397 EXPECT_TRUE(restore_function_1->RunImpl()); 398 EXPECT_TRUE(restore_function_1->RunImpl());
398 399
399 EXPECT_FALSE(window1_state->IsMinimized()); 400 EXPECT_FALSE(window1_state->IsMinimized());
400 EXPECT_FALSE(window2_state->IsMinimized()); 401 EXPECT_FALSE(window2_state->IsMinimized());
401 EXPECT_FALSE(window3_state->IsMinimized()); 402 EXPECT_FALSE(window3_state->IsMinimized());
402 } 403 }
403 404
404 } // namespace chromeos 405 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/preferences_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698