| OLD | NEW | 
|    1 // Copyright 2014 The Chromium Authors. All rights reserved. |    1 // Copyright 2014 The Chromium Authors. All rights reserved. | 
|    2 // Use of this source code is governed by a BSD-style license that can be |    2 // Use of this source code is governed by a BSD-style license that can be | 
|    3 // found in the LICENSE file. |    3 // found in the LICENSE file. | 
|    4  |    4  | 
|    5 #include "device/battery/battery_status_service.h" |    5 #include "device/battery/battery_status_service.h" | 
|    6  |    6  | 
 |    7 #include <utility> | 
 |    8  | 
|    7 #include "base/bind.h" |    9 #include "base/bind.h" | 
|    8 #include "base/message_loop/message_loop.h" |   10 #include "base/message_loop/message_loop.h" | 
|    9 #include "base/single_thread_task_runner.h" |   11 #include "base/single_thread_task_runner.h" | 
|   10 #include "device/battery/battery_monitor_impl.h" |   12 #include "device/battery/battery_monitor_impl.h" | 
|   11 #include "device/battery/battery_status_manager.h" |   13 #include "device/battery/battery_status_manager.h" | 
|   12  |   14  | 
|   13 namespace device { |   15 namespace device { | 
|   14  |   16  | 
|   15 BatteryStatusService::BatteryStatusService() |   17 BatteryStatusService::BatteryStatusService() | 
|   16     : main_thread_task_runner_(base::MessageLoop::current()->task_runner()), |   18     : main_thread_task_runner_(base::MessageLoop::current()->task_runner()), | 
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   92   is_shutdown_ = true; |   94   is_shutdown_ = true; | 
|   93 } |   95 } | 
|   94  |   96  | 
|   95 const BatteryStatusService::BatteryUpdateCallback& |   97 const BatteryStatusService::BatteryUpdateCallback& | 
|   96 BatteryStatusService::GetUpdateCallbackForTesting() const { |   98 BatteryStatusService::GetUpdateCallbackForTesting() const { | 
|   97   return update_callback_; |   99   return update_callback_; | 
|   98 } |  100 } | 
|   99  |  101  | 
|  100 void BatteryStatusService::SetBatteryManagerForTesting( |  102 void BatteryStatusService::SetBatteryManagerForTesting( | 
|  101     scoped_ptr<BatteryStatusManager> test_battery_manager) { |  103     scoped_ptr<BatteryStatusManager> test_battery_manager) { | 
|  102   battery_fetcher_ = test_battery_manager.Pass(); |  104   battery_fetcher_ = std::move(test_battery_manager); | 
|  103   status_ = BatteryStatus(); |  105   status_ = BatteryStatus(); | 
|  104   status_updated_ = false; |  106   status_updated_ = false; | 
|  105 } |  107 } | 
|  106  |  108  | 
|  107 }  // namespace device |  109 }  // namespace device | 
| OLD | NEW |