arc: Revamp the ArcBridgeService interface

components/arc/audio/arc_audio_bridge.cc

 // Copyright 2016 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/audio/arc_audio_bridge.h"
 
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/wm_shell.h"
 #include "base/logging.h"
 #include "chromeos/audio/audio_device.h"
 
 namespace arc {
 
 ArcAudioBridge::ArcAudioBridge(ArcBridgeService* bridge_service)
     : ArcService(bridge_service), binding_(this) {
-  arc_bridge_service()->AddObserver(this);
+  arc_bridge_service()->audio()->AddObserver(this);
   if (chromeos::CrasAudioHandler::IsInitialized()) {
     cras_audio_handler_ = chromeos::CrasAudioHandler::Get();
     cras_audio_handler_->AddAudioObserver(this);
   }
 }
 
 ArcAudioBridge::~ArcAudioBridge() {
-  arc_bridge_service()->RemoveObserver(this);
+  arc_bridge_service()->audio()->RemoveObserver(this);

[hidehiko, 2016/07/11 05:24:53]

nit: As you're here, could you move this to after L27?
(unregister callback in the reverse order of the registration sounds a good
manner).

[Luis Héctor Chávez, 2016/07/11 17:13:34]

Done.

   if (cras_audio_handler_ && chromeos::CrasAudioHandler::IsInitialized()) {
     cras_audio_handler_->RemoveAudioObserver(this);
   }
 }
 
-void ArcAudioBridge::OnAudioInstanceReady() {
-  mojom::AudioInstance* audio_instance =
-      arc_bridge_service()->audio_instance();
-  if (!audio_instance) {
-    LOG(ERROR) << "OnAudioInstanceReady called, "
-               << "but no audio instance found";
-    return;
-  }
-  if (arc_bridge_service()->audio_version() < 1) {
+void ArcAudioBridge::OnInstanceReady(mojom::AudioInstance* audio_instance,
+                                     uint32_t version) {
+  if (version < 1) {
     LOG(WARNING) << "Audio instance is too old and does not support Init()";
     return;
   }
   audio_instance->Init(binding_.CreateInterfacePtrAndBind());
 }
 
 void ArcAudioBridge::ShowVolumeControls() {
   VLOG(2) << "ArcAudioBridge::ShowVolumeControls";
-  ash::WmShell::Get()->system_tray_notifier()->
-      NotifyAudioOutputVolumeChanged(0, 0);
+  ash::WmShell::Get()->system_tray_notifier()->NotifyAudioOutputVolumeChanged(
+      0, 0);
 }
 
 void ArcAudioBridge::OnAudioNodesChanged() {
   uint64_t output_id = cras_audio_handler_->GetPrimaryActiveOutputNode();
   const chromeos::AudioDevice* output_device =
       cras_audio_handler_->GetDeviceFromId(output_id);
   bool headphone_inserted =
-    (output_device &&
-     output_device->type == chromeos::AudioDeviceType::AUDIO_TYPE_HEADPHONE);
+      (output_device &&
+       output_device->type == chromeos::AudioDeviceType::AUDIO_TYPE_HEADPHONE);
 
   uint64_t input_id = cras_audio_handler_->GetPrimaryActiveInputNode();
   const chromeos::AudioDevice* input_device =
       cras_audio_handler_->GetDeviceFromId(input_id);
   bool microphone_inserted =
-    (input_device &&
-     input_device->type == chromeos::AudioDeviceType::AUDIO_TYPE_MIC);
+      (input_device &&
+       input_device->type == chromeos::AudioDeviceType::AUDIO_TYPE_MIC);
 
-  VLOG(1) << "HEADPHONE " << headphone_inserted
-          << " MICROPHONE " << microphone_inserted;
+  VLOG(1) << "HEADPHONE " << headphone_inserted << " MICROPHONE "
+          << microphone_inserted;
   SendSwitchState(headphone_inserted, microphone_inserted);
 }
 
 void ArcAudioBridge::SendSwitchState(bool headphone_inserted,
                                      bool microphone_inserted) {
   uint32_t switch_state = 0;
   if (headphone_inserted) {
     switch_state |=
         (1 << static_cast<uint32_t>(mojom::AudioSwitch::SW_HEADPHONE_INSERT));
   }
   if (microphone_inserted) {
     switch_state |=
         (1 << static_cast<uint32_t>(mojom::AudioSwitch::SW_MICROPHONE_INSERT));
   }
 
   VLOG(1) << "Send switch state " << switch_state;
-  mojom::AudioInstance* audio_instance = arc_bridge_service()->audio_instance();
+  mojom::AudioInstance* audio_instance =
+      arc_bridge_service()->audio()->instance();
   if (audio_instance)
     audio_instance->NotifySwitchState(switch_state);
 }
 
 }  // namespace arc