Index: chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc |
diff --git a/chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc b/chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc |
index 72084a3ee5fde4bd05ed398a575da244120388e9..d263c9f40945efdcb0bbcc1068256a6ee1e6df17 100644 |
--- a/chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc |
+++ b/chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc |
@@ -54,14 +54,14 @@ class TestMergeSessionLoadPage : public MergeSessionLoadPage { |
class MergeSessionLoadPageTest : public ChromeRenderViewHostTestHarness { |
protected: |
- virtual void SetUp() OVERRIDE { |
+ virtual void SetUp() override { |
ChromeRenderViewHostTestHarness::SetUp(); |
#if defined OS_CHROMEOS |
test_user_manager_.reset(new chromeos::ScopedTestUserManager()); |
#endif |
} |
- virtual void TearDown() OVERRIDE { |
+ virtual void TearDown() override { |
#if defined OS_CHROMEOS |
// Clean up pending tasks that might depend on the user manager. |
base::RunLoop().RunUntilIdle(); |