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

Side by Side Diff: chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc

Issue 13671005: Re-apply 192420: Move login switches to src/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
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 "chrome/browser/chromeos/login/wallpaper_manager.h" 5 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
6 6
7 #include "ash/desktop_background/desktop_background_controller.h" 7 #include "ash/desktop_background/desktop_background_controller.h"
8 #include "ash/desktop_background/desktop_background_controller_observer.h" 8 #include "ash/desktop_background/desktop_background_controller_observer.h"
9 #include "ash/display/display_manager.h" 9 #include "ash/display/display_manager.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
11 #include "ash/test/display_manager_test_api.h" 11 #include "ash/test/display_manager_test_api.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/file_util.h" 13 #include "base/file_util.h"
14 #include "base/message_loop.h" 14 #include "base/message_loop.h"
15 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
16 #include "base/time.h" 16 #include "base/time.h"
17 #include "base/values.h" 17 #include "base/values.h"
18 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h" 18 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
19 #include "chrome/browser/chromeos/login/user.h" 19 #include "chrome/browser/chromeos/login/user.h"
20 #include "chrome/browser/chromeos/login/user_manager.h" 20 #include "chrome/browser/chromeos/login/user_manager.h"
21 #include "chrome/browser/prefs/scoped_user_pref_update.h" 21 #include "chrome/browser/prefs/scoped_user_pref_update.h"
22 #include "chrome/common/chrome_switches.h" 22 #include "chrome/common/chrome_switches.h"
23 #include "chrome/test/base/testing_browser_process.h" 23 #include "chrome/test/base/testing_browser_process.h"
24 #include "chromeos/chromeos_switches.h"
24 #include "ui/aura/env.h" 25 #include "ui/aura/env.h"
25 #include "ui/base/resource/resource_bundle.h" 26 #include "ui/base/resource/resource_bundle.h"
26 27
27 using namespace ash; 28 using namespace ash;
28 29
29 namespace chromeos { 30 namespace chromeos {
30 31
31 namespace { 32 namespace {
32 33
33 #if defined(GOOGLE_CHROME_BUILD) 34 #if defined(GOOGLE_CHROME_BUILD)
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 // This test should finish normally. If timeout, it is probably because chrome 402 // This test should finish normally. If timeout, it is probably because chrome
402 // can not handle pre migrated user profile (M21 profile or older). 403 // can not handle pre migrated user profile (M21 profile or older).
403 } 404 }
404 405
405 class WallpaperManagerBrowserTestNoAnimation 406 class WallpaperManagerBrowserTestNoAnimation
406 : public WallpaperManagerBrowserTest { 407 : public WallpaperManagerBrowserTest {
407 public: 408 public:
408 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 409 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
409 command_line->AppendSwitch(switches::kLoginManager); 410 command_line->AppendSwitch(switches::kLoginManager);
410 command_line->AppendSwitchASCII(switches::kLoginProfile, "user"); 411 command_line->AppendSwitchASCII(switches::kLoginProfile, "user");
411 command_line->AppendSwitch(switches::kDisableLoginAnimations); 412 command_line->AppendSwitch(::switches::kDisableLoginAnimations);
412 command_line->AppendSwitch(switches::kDisableBootAnimation); 413 command_line->AppendSwitch(::switches::kDisableBootAnimation);
413 } 414 }
414 }; 415 };
415 416
416 // Same test as WallpaperManagerBrowserTest.UseMigratedWallpaperInfo. But 417 // Same test as WallpaperManagerBrowserTest.UseMigratedWallpaperInfo. But
417 // disabled boot and login animation. 418 // disabled boot and login animation.
418 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestNoAnimation, 419 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestNoAnimation,
419 PRE_UseMigratedWallpaperInfo) { 420 PRE_UseMigratedWallpaperInfo) {
420 // New user log in, a default wallpaper is loaded. 421 // New user log in, a default wallpaper is loaded.
421 LogIn(kTestUser1); 422 LogIn(kTestUser1);
422 WaitAsyncWallpaperLoad(); 423 WaitAsyncWallpaperLoad();
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 457
457 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestNoAnimation, 458 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestNoAnimation,
458 UsePreMigrationWallpaperInfo) { 459 UsePreMigrationWallpaperInfo) {
459 LogIn(kTestUser1); 460 LogIn(kTestUser1);
460 WaitAsyncWallpaperLoad(); 461 WaitAsyncWallpaperLoad();
461 // This test should finish normally. If timeout, it is probably because chrome 462 // This test should finish normally. If timeout, it is probably because chrome
462 // can not handle pre migrated user profile (M21 profile or older). 463 // can not handle pre migrated user profile (M21 profile or older).
463 } 464 }
464 465
465 } // namepace chromeos 466 } // namepace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/user_manager_impl.cc ('k') | chrome/browser/chromeos/login/wizard_in_process_browser_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698