chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc - Issue 629603002: replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]*

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/sync_file_system/drive_backend/conflict_resolver_unittest.cc

Issue 629603002: replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase on master 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/sync_file_system/drive_backend/conflict_resolver.h ('k') | chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc

diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc

index 5318238a64b9383888599f7f35e876dcbebcc79c..665d3307d05e3404e986fe057f09d0288993bc6a 100644

--- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc

+++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc

@@ -54,7 +54,7 @@ class ConflictResolverTest : public testing::Test {

: thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {}

virtual ~ConflictResolverTest() {}

- virtual void SetUp() OVERRIDE {

+ virtual void SetUp() override {

ASSERT_TRUE(database_dir_.CreateUniqueTempDir());

in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));

@@ -85,7 +85,7 @@ class ConflictResolverTest : public testing::Test {

sync_task_manager_->Initialize(SYNC_STATUS_OK);

}

- virtual void TearDown() OVERRIDE {

+ virtual void TearDown() override {

sync_task_manager_.reset();

RevokeSyncableFileSystem();

fake_drive_helper_.reset();