| Index: components/arc/power/arc_power_bridge.cc
|
| diff --git a/components/arc/power/arc_power_bridge.cc b/components/arc/power/arc_power_bridge.cc
|
| index 172d8fe0a775e5db379846a36de468eec63e125e..05b438b16e950f686cfcb63aa9d699bcfb2dbdfc 100644
|
| --- a/components/arc/power/arc_power_bridge.cc
|
| +++ b/components/arc/power/arc_power_bridge.cc
|
| @@ -13,15 +13,13 @@
|
|
|
| namespace arc {
|
|
|
| -ArcPowerBridge::ArcPowerBridge(ArcBridgeService* arc_bridge_service)
|
| - : arc_bridge_service_(arc_bridge_service), binding_(this) {
|
| - arc_bridge_service->AddObserver(this);
|
| - if (arc_bridge_service->power_instance())
|
| - OnPowerInstanceReady();
|
| +ArcPowerBridge::ArcPowerBridge(ArcBridgeService* bridge_service)
|
| + : ArcService(bridge_service), binding_(this) {
|
| + arc_bridge_service()->AddObserver(this);
|
| }
|
|
|
| ArcPowerBridge::~ArcPowerBridge() {
|
| - arc_bridge_service_->RemoveObserver(this);
|
| + arc_bridge_service()->RemoveObserver(this);
|
| ReleaseAllDisplayWakeLocks();
|
| }
|
|
|
| @@ -31,7 +29,7 @@ void ArcPowerBridge::OnStateChanged(ArcBridgeService::State state) {
|
| }
|
|
|
| void ArcPowerBridge::OnPowerInstanceReady() {
|
| - PowerInstance* power_instance = arc_bridge_service_->power_instance();
|
| + PowerInstance* power_instance = arc_bridge_service()->power_instance();
|
| if (!power_instance) {
|
| LOG(ERROR) << "OnPowerInstanceReady called, but no power instance found";
|
| return;
|
|
|