chrome/browser/chromeos/settings/device_settings_provider_unittest.cc - Issue 1100223002: Update {virtual,override} to follow C++11 style in chrome.

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/settings/device_settings_provider_unittest.cc

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

Patch Set: Rebase Created 5 years, 8 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/policy/network_configuration_updater_unittest.cc ('k') | chrome/browser/chromeos/settings/session_manager_operation_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/settings/device_settings_provider_unittest.cc

diff --git a/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc b/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc

index 5451f0d1fae7f3ebfc930befc47fc300364164f1..56ff9d9fb4081e9bba5e623aeb7ec90016569b83 100644

--- a/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc

+++ b/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc

@@ -52,7 +52,7 @@ class DeviceSettingsProviderTest : public DeviceSettingsTestBase {

: local_state_(TestingBrowserProcess::GetGlobal()),

user_data_dir_override_(chrome::DIR_USER_DATA) {}

- virtual void SetUp() override {

+ void SetUp() override {

DeviceSettingsTestBase::SetUp();

EXPECT_CALL(*this, SettingChanged(_)).Times(AnyNumber());

@@ -64,9 +64,7 @@ class DeviceSettingsProviderTest : public DeviceSettingsTestBase {

Mock::VerifyAndClearExpectations(this);

}

- virtual void TearDown() override {

- DeviceSettingsTestBase::TearDown();

- }

+ void TearDown() override { DeviceSettingsTestBase::TearDown(); }

// Helper routine to enable/disable all reporting settings in policy.

void SetReportingSettings(bool enable_reporting, int frequency) {