| Index: services/device/battery/battery_status_service_unittest.cc
|
| diff --git a/device/battery/battery_status_service_unittest.cc b/services/device/battery/battery_status_service_unittest.cc
|
| similarity index 92%
|
| rename from device/battery/battery_status_service_unittest.cc
|
| rename to services/device/battery/battery_status_service_unittest.cc
|
| index a9a964267d50b15f32b2662e7492ed8fef763114..b1c8027ac424ce28cabd14875986435f33ea4f00 100644
|
| --- a/device/battery/battery_status_service_unittest.cc
|
| +++ b/services/device/battery/battery_status_service_unittest.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "device/battery/battery_status_service.h"
|
| +#include "services/device/battery/battery_status_service.h"
|
|
|
| #include <memory>
|
| #include <utility>
|
| @@ -11,7 +11,7 @@
|
| #include "base/macros.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/run_loop.h"
|
| -#include "device/battery/battery_status_manager.h"
|
| +#include "services/device/battery/battery_status_manager.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| namespace device {
|
| @@ -56,7 +56,7 @@ class BatteryStatusServiceTest : public testing::Test {
|
| : battery_manager_(nullptr),
|
| callback1_invoked_count_(0),
|
| callback2_invoked_count_(0) {}
|
| - ~BatteryStatusServiceTest() override {}
|
| + ~BatteryStatusServiceTest() override {}
|
|
|
| protected:
|
| typedef BatteryStatusService::BatteryUpdateSubscription BatterySubscription;
|
| @@ -76,26 +76,18 @@ class BatteryStatusServiceTest : public testing::Test {
|
| battery_service_.SetBatteryManagerForTesting(std::move(battery_manager));
|
| }
|
|
|
| - void TearDown() override {
|
| - base::RunLoop().RunUntilIdle();
|
| - }
|
| + void TearDown() override { base::RunLoop().RunUntilIdle(); }
|
|
|
| - FakeBatteryManager* battery_manager() {
|
| - return battery_manager_;
|
| - }
|
| + FakeBatteryManager* battery_manager() { return battery_manager_; }
|
|
|
| std::unique_ptr<BatterySubscription> AddCallback(
|
| const BatteryStatusService::BatteryUpdateCallback& callback) {
|
| return battery_service_.AddCallback(callback);
|
| }
|
|
|
| - int callback1_invoked_count() const {
|
| - return callback1_invoked_count_;
|
| - }
|
| + int callback1_invoked_count() const { return callback1_invoked_count_; }
|
|
|
| - int callback2_invoked_count() const {
|
| - return callback2_invoked_count_;
|
| - }
|
| + int callback2_invoked_count() const { return callback2_invoked_count_; }
|
|
|
| const mojom::BatteryStatus& battery_status() const { return battery_status_; }
|
|
|
|
|