chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc - Issue 856493004: Update {virtual,override,final} to follow C++11 style in chrome/browser/chromeos/login.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc

Issue 856493004: Update {virtual,override,final} to follow C++11 style in chrome/browser/chromeos/login. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 11 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/login/signin/merge_session_load_page.h ('k') | chrome/browser/chromeos/login/signin/merge_session_throttle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 5bc50f134ffcbe167766bb20721bb08aa688a787..31572465e3b50dbc78a8c882778865132bdb4160 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

@@ -48,14 +48,14 @@ class TestMergeSessionLoadPage : public MergeSessionLoadPage {

class MergeSessionLoadPageTest : public ChromeRenderViewHostTestHarness {

protected:

- virtual void SetUp() override {

+ void SetUp() override {

ChromeRenderViewHostTestHarness::SetUp();

#if defined OS_CHROMEOS

test_user_manager_.reset(new chromeos::ScopedTestUserManager());

#endif

}

- virtual void TearDown() override {

+ void TearDown() override {

#if defined OS_CHROMEOS

// Clean up pending tasks that might depend on the user manager.

base::RunLoop().RunUntilIdle();