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

Unified Diff: content/browser/battery_status/battery_status_service_unittest.cc

Issue 634703003: Replacing the OVERRIDE with override and FINAL with final in content/browser/[accessibility|battery… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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: content/browser/battery_status/battery_status_service_unittest.cc
diff --git a/content/browser/battery_status/battery_status_service_unittest.cc b/content/browser/battery_status/battery_status_service_unittest.cc
index ab52d10cf6d9e8c6847626eb5f0cfcb64a5bff08..54d4833c52bd9855b75f544eae640b7aee32f3c1 100644
--- a/content/browser/battery_status/battery_status_service_unittest.cc
+++ b/content/browser/battery_status/battery_status_service_unittest.cc
@@ -21,12 +21,12 @@ class FakeBatteryManager : public BatteryStatusManager {
virtual ~FakeBatteryManager() { }
// Methods from Battery Status Manager
- virtual bool StartListeningBatteryChange() OVERRIDE {
+ virtual bool StartListeningBatteryChange() override {
start_invoked_count_++;
return true;
}
- virtual void StopListeningBatteryChange() OVERRIDE {
+ virtual void StopListeningBatteryChange() override {
stop_invoked_count_++;
}
@@ -59,7 +59,7 @@ class BatteryStatusServiceTest : public testing::Test {
protected:
typedef BatteryStatusService::BatteryUpdateSubscription BatterySubscription;
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
callback1_ = base::Bind(&BatteryStatusServiceTest::Callback1,
base::Unretained(this));
callback2_ = base::Bind(&BatteryStatusServiceTest::Callback2,
@@ -70,7 +70,7 @@ class BatteryStatusServiceTest : public testing::Test {
battery_service_->SetBatteryManagerForTesting(battery_manager_);
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
base::RunLoop().RunUntilIdle();
battery_service_->SetBatteryManagerForTesting(0);
}

Powered by Google App Engine
This is Rietveld 408576698