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

Unified Diff: chrome/browser/chromeos/policy/device_status_collector_browsertest.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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/policy/device_status_collector_browsertest.cc
diff --git a/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc b/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc
index 9e1137d96a7e5e308f2b8e84191c3ac35a8c974d..6459fc9d9b312566d5da5bf303b998eb2de660b7 100644
--- a/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc
+++ b/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc
@@ -108,14 +108,14 @@ class TestingDeviceStatusCollector : public policy::DeviceStatusCollector {
}
protected:
- virtual void CheckIdleState() OVERRIDE {
+ virtual void CheckIdleState() override {
// This should never be called in testing, as it results in a dbus call.
ADD_FAILURE();
}
// Each time this is called, returns a time that is a fixed increment
// later than the previous time.
- virtual Time GetCurrentTime() OVERRIDE {
+ virtual Time GetCurrentTime() override {
int poll_interval = policy::DeviceStatusCollector::kIdlePollIntervalSeconds;
return baseline_time_ +
TimeDelta::FromSeconds(poll_interval * baseline_offset_periods_++);
@@ -191,7 +191,7 @@ class DeviceStatusCollectorTest : public testing::Test {
cros_settings_->AddSettingsProvider(device_settings_provider_);
}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
// Disable network interface reporting since it requires additional setup.
cros_settings_->SetBoolean(chromeos::kReportDeviceNetworkInterfaces, false);
}
@@ -708,7 +708,7 @@ static const FakeDeviceData kFakeDevices[] = {
class DeviceStatusCollectorNetworkInterfacesTest
: public DeviceStatusCollectorTest {
protected:
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
chromeos::DBusThreadManager::Initialize();
chromeos::NetworkHandler::Initialize();
chromeos::ShillDeviceClient::TestInterface* test_device_client =
@@ -740,7 +740,7 @@ class DeviceStatusCollectorNetworkInterfacesTest
base::RunLoop().RunUntilIdle();
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
chromeos::NetworkHandler::Shutdown();
chromeos::DBusThreadManager::Shutdown();
}

Powered by Google App Engine
This is Rietveld 408576698