Index: chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc |
diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc |
index 35887e71e40f207179d819f9d399ae04aa94315c..ed33cff53bc59da918f46d308f6ef89421d020f6 100644 |
--- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc |
+++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc |
@@ -64,7 +64,7 @@ class WallpaperManagerBrowserTest : public InProcessBrowserTest { |
virtual ~WallpaperManagerBrowserTest () {} |
- virtual void SetUpOnMainThread() OVERRIDE { |
+ virtual void SetUpOnMainThread() override { |
controller_ = ash::Shell::GetInstance()->desktop_background_controller(); |
local_state_ = g_browser_process->local_state(); |
DesktopBackgroundController::TestAPI(controller_) |
@@ -72,12 +72,12 @@ class WallpaperManagerBrowserTest : public InProcessBrowserTest { |
UpdateDisplay("800x600"); |
} |
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
+ virtual void SetUpCommandLine(CommandLine* command_line) override { |
command_line->AppendSwitch(switches::kLoginManager); |
command_line->AppendSwitchASCII(switches::kLoginProfile, "user"); |
} |
- virtual void TearDownOnMainThread() OVERRIDE { |
+ virtual void TearDownOnMainThread() override { |
controller_ = NULL; |
} |
@@ -349,7 +349,7 @@ IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, |
class WallpaperManagerBrowserTestNoAnimation |
: public WallpaperManagerBrowserTest { |
public: |
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
+ virtual void SetUpCommandLine(CommandLine* command_line) override { |
command_line->AppendSwitch(switches::kLoginManager); |
command_line->AppendSwitchASCII(switches::kLoginProfile, "user"); |
command_line->AppendSwitch(chromeos::switches::kDisableLoginAnimations); |
@@ -412,7 +412,7 @@ IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestNoAnimation, |
class WallpaperManagerBrowserTestCrashRestore |
: public WallpaperManagerBrowserTest { |
public: |
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
+ virtual void SetUpCommandLine(CommandLine* command_line) override { |
command_line->AppendSwitch(chromeos::switches::kDisableLoginAnimations); |
command_line->AppendSwitch(chromeos::switches::kDisableBootAnimation); |
command_line->AppendSwitchASCII(switches::kLoginUser, kTestUser1); |
@@ -436,7 +436,7 @@ IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestCrashRestore, |
class WallpaperManagerBrowserTestCacheUpdate |
: public WallpaperManagerBrowserTest { |
public: |
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
+ virtual void SetUpCommandLine(CommandLine* command_line) override { |
command_line->AppendSwitchASCII(switches::kLoginUser, kTestUser1); |
command_line->AppendSwitchASCII(switches::kLoginProfile, "user"); |
} |
@@ -567,10 +567,10 @@ class TestObserver : public WallpaperManager::Observer { |
wallpaper_manager_->RemoveObserver(this); |
} |
- virtual void OnWallpaperAnimationFinished(const std::string&) OVERRIDE { |
+ virtual void OnWallpaperAnimationFinished(const std::string&) override { |
} |
- virtual void OnUpdateWallpaperForTesting() OVERRIDE { |
+ virtual void OnUpdateWallpaperForTesting() override { |
++update_wallpaper_count_; |
} |