chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc - Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]*

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/prefs/synced_pref_change_registrar_browsertest.cc

Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]* (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/prefs/synced_pref_change_registrar.h ('k') | chrome/browser/prefs/tracked/dictionary_hash_store_contents.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc

diff --git a/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc b/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc

index a211171fb6b43ba6e7563af3e7571ae518fea737..939aff40430e297bea717f09a37249105149691f 100644

--- a/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc

+++ b/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc

@@ -94,7 +94,7 @@ class SyncedPrefChangeRegistrarTest : public InProcessBrowserTest {

private:

#if defined(ENABLE_CONFIGURATION_POLICY)

- virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {

+ virtual void SetUpInProcessBrowserTestFixture() override {

EXPECT_CALL(policy_provider_, IsInitializationComplete(_))

.WillRepeatedly(Return(true));

policy::BrowserPolicyConnector::SetPolicyProviderForTesting(

@@ -102,7 +102,7 @@ class SyncedPrefChangeRegistrarTest : public InProcessBrowserTest {

}

#endif

- virtual void SetUpOnMainThread() OVERRIDE {

+ virtual void SetUpOnMainThread() override {

prefs_ = PrefServiceSyncable::FromProfile(browser()->profile());

syncer_ = prefs_->GetSyncableService(syncer::PREFERENCES);

syncer_->MergeDataAndStartSyncing(

@@ -114,7 +114,7 @@ class SyncedPrefChangeRegistrarTest : public InProcessBrowserTest {

registrar_.reset(new SyncedPrefChangeRegistrar(prefs_));

}

- virtual void TearDownOnMainThread() OVERRIDE {

+ virtual void TearDownOnMainThread() override {

registrar_.reset();

}