thermald: post libchrome uprev clean-up
BUG=chromium:909719
TEST=unit tests
Change-Id: Ie83c1f80fc82eda28a874604dcdf269739dcfef5
Reviewed-on: https://chrome-internal-review.googlesource.com/c/chromeos/thermald/+/2441204
Tested-by: Grace Cham <[email protected]>
Reviewed-by: Danny Mitzel <[email protected]>
Reviewed-by: Qijiang Fan <[email protected]>
Commit-Queue: Qijiang Fan <[email protected]>
diff --git a/metrics_reporter_unittest.cc b/metrics_reporter_unittest.cc
index 8773d31..8997e77 100644
--- a/metrics_reporter_unittest.cc
+++ b/metrics_reporter_unittest.cc
@@ -40,11 +40,7 @@
KeyValuePublisher output_publisher_;
unique_ptr<MockTemperatureMonitor> temp_monitor_0_;
unique_ptr<MockTemperatureMonitor> temp_monitor_1_;
-#if BASE_VER < 576279
- base::MockTimer *metrics_timer_;
-#else
base::MockRepeatingTimer *metrics_timer_;
-#endif
static MetricsLibraryMock metrics_lib_;
};
@@ -59,11 +55,7 @@
&metrics_lib_,
base::TimeDelta::FromSeconds(1)));
-#if BASE_VER < 576279
- metrics_timer_ = new base::MockTimer(true, true);
-#else
metrics_timer_ = new base::MockRepeatingTimer();
-#endif
metrics_reporter_->timer_.reset(metrics_timer_);
}
diff --git a/temperature_sensor_monitor_unittest.cc b/temperature_sensor_monitor_unittest.cc
index d0a1941..c2a379e 100644
--- a/temperature_sensor_monitor_unittest.cc
+++ b/temperature_sensor_monitor_unittest.cc
@@ -85,11 +85,7 @@
sensor_.reset(new MockTemperatureSensor("mock sensor"));
monitor_.reset(new TemperatureSensorMonitor(sensor_.get(),
test_sampling_period_));
-#if BASE_VER < 576279
- timer_ = new base::MockTimer(true, true);
-#else
timer_ = new base::MockRepeatingTimer();
-#endif
monitor_->timer_.reset(timer_);
}
@@ -109,11 +105,7 @@
unique_ptr<MockTemperatureSensor> sensor_;
unique_ptr<TemperatureSensorMonitor> monitor_;
-#if BASE_VER < 576279
- base::MockTimer *timer_;
-#else
base::MockRepeatingTimer *timer_;
-#endif
base::MessageLoop main_loop_;
std::unique_ptr<base::RunLoop> run_loop_;
static base::TimeDelta test_sampling_period_;
