arc: Revamp the ArcBridgeService interface

components/arc/power/arc_power_bridge.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/arc/power/arc_power_bridge.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "ash/shell.h"
 #include "base/logging.h"
 #include "chromeos/dbus/power_policy_controller.h"
 #include "components/arc/arc_service_manager.h"
 
 namespace arc {
 
 ArcPowerBridge::ArcPowerBridge(ArcBridgeService* bridge_service)
     : ArcService(bridge_service), binding_(this) {
-  arc_bridge_service()->AddObserver(this);
+  arc_bridge_service()->power()->AddObserver(this);
 }
 
 ArcPowerBridge::~ArcPowerBridge() {
-  arc_bridge_service()->RemoveObserver(this);
+  arc_bridge_service()->power()->RemoveObserver(this);
   ReleaseAllDisplayWakeLocks();
 }
 
-void ArcPowerBridge::OnPowerInstanceReady() {
-  mojom::PowerInstance* power_instance = arc_bridge_service()->power_instance();
+void ArcPowerBridge::OnInstanceReady() {
+  mojom::PowerInstance* power_instance =
+      arc_bridge_service()->power()->instance();
   if (!power_instance) {
     LOG(ERROR) << "OnPowerInstanceReady called, but no power instance found";
     return;
   }
 
   power_instance->Init(binding_.CreateInterfacePtrAndBind());
   ash::Shell::GetInstance()->display_configurator()->AddObserver(this);
 }
 
-void ArcPowerBridge::OnPowerInstanceClosed() {
+void ArcPowerBridge::OnInstanceClosed() {
   ash::Shell::GetInstance()->display_configurator()->RemoveObserver(this);
   ReleaseAllDisplayWakeLocks();
 }
 
 void ArcPowerBridge::OnPowerStateChanged(
     chromeos::DisplayPowerState power_state) {
-  mojom::PowerInstance* power_instance = arc_bridge_service()->power_instance();
+  mojom::PowerInstance* power_instance =
+      arc_bridge_service()->power()->instance();
   if (!power_instance) {
     LOG(ERROR) << "PowerInstance is not available";
     return;
   }
 
   bool enabled = (power_state != chromeos::DISPLAY_POWER_ALL_OFF);
   power_instance->SetInteractive(enabled);
 }
 
 void ArcPowerBridge::OnAcquireDisplayWakeLock(mojom::DisplayWakeLockType type) {
@@ skipping 56 matching lines @@
   chromeos::PowerPolicyController* controller =
       chromeos::PowerPolicyController::Get();
 
   for (const auto& it : wake_locks_) {
     controller->RemoveWakeLock(it.second);
   }
   wake_locks_.clear();
 }
 
 }  // namespace arc