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

Side by Side Diff: chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h Created 6 years, 2 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/run_loop.h" 5 #include "base/run_loop.h"
6 #include "base/time/time.h" 6 #include "base/time/time.h"
7 #include "chrome/browser/chromeos/login/signin/merge_session_load_page.h" 7 #include "chrome/browser/chromeos/login/signin/merge_session_load_page.h"
8 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h" 8 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"
9 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h" 9 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h"
10 #include "chrome/browser/chromeos/login/users/scoped_test_user_manager.h" 10 #include "chrome/browser/chromeos/login/users/scoped_test_user_manager.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 } 47 }
48 48
49 private: 49 private:
50 MergeSessionLoadPageTest* test_page_; 50 MergeSessionLoadPageTest* test_page_;
51 51
52 DISALLOW_COPY_AND_ASSIGN(TestMergeSessionLoadPage); 52 DISALLOW_COPY_AND_ASSIGN(TestMergeSessionLoadPage);
53 }; 53 };
54 54
55 class MergeSessionLoadPageTest : public ChromeRenderViewHostTestHarness { 55 class MergeSessionLoadPageTest : public ChromeRenderViewHostTestHarness {
56 protected: 56 protected:
57 virtual void SetUp() OVERRIDE { 57 virtual void SetUp() override {
58 ChromeRenderViewHostTestHarness::SetUp(); 58 ChromeRenderViewHostTestHarness::SetUp();
59 #if defined OS_CHROMEOS 59 #if defined OS_CHROMEOS
60 test_user_manager_.reset(new chromeos::ScopedTestUserManager()); 60 test_user_manager_.reset(new chromeos::ScopedTestUserManager());
61 #endif 61 #endif
62 } 62 }
63 63
64 virtual void TearDown() OVERRIDE { 64 virtual void TearDown() override {
65 #if defined OS_CHROMEOS 65 #if defined OS_CHROMEOS
66 // Clean up pending tasks that might depend on the user manager. 66 // Clean up pending tasks that might depend on the user manager.
67 base::RunLoop().RunUntilIdle(); 67 base::RunLoop().RunUntilIdle();
68 test_user_manager_.reset(); 68 test_user_manager_.reset();
69 #endif 69 #endif
70 ChromeRenderViewHostTestHarness::TearDown(); 70 ChromeRenderViewHostTestHarness::TearDown();
71 } 71 }
72 72
73 void Navigate(const char* url, int page_id) { 73 void Navigate(const char* url, int page_id) {
74 WebContentsTester::For(web_contents())->TestDidNavigate( 74 WebContentsTester::For(web_contents())->TestDidNavigate(
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 174
175 // The URL remains to be URL2. 175 // The URL remains to be URL2.
176 EXPECT_EQ(kURL2, web_contents()->GetVisibleURL().spec()); 176 EXPECT_EQ(kURL2, web_contents()->GetVisibleURL().spec());
177 177
178 // Commit navigation and the interstitial page is gone. 178 // Commit navigation and the interstitial page is gone.
179 Navigate(kURL2, 2); 179 Navigate(kURL2, 2);
180 EXPECT_FALSE(GetMergeSessionLoadPage()); 180 EXPECT_FALSE(GetMergeSessionLoadPage());
181 } 181 }
182 182
183 } // namespace chromeos 183 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698