chromeos: Make system tray audio item observe CrasAudioHandler directly

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 "ash/common/system/chromeos/audio/tray_audio.h"
 #include "base/logging.h"
 #include "chromeos/audio/audio_device.h"
 #include "components/arc/arc_bridge_service.h"
 
 namespace arc {
 
 namespace {
 
 // Note: unlike most of our mojom definitions, AudioInstance::Init's minimum
 // version is not zero.
@@ skipping 20 matching lines @@
 void ArcAudioBridge::OnInstanceReady() {
   mojom::AudioInstance* audio_instance =
       arc_bridge_service()->audio()->GetInstanceForMethod(
           "Init", kMinInstanceVersionForInit);
   DCHECK(audio_instance);  // the instance on ARC side is too old.
   audio_instance->Init(binding_.CreateInterfacePtrAndBind());
 }
 
 void ArcAudioBridge::ShowVolumeControls() {
   VLOG(2) << "ArcAudioBridge::ShowVolumeControls";
-  ash::WmShell::Get()->system_tray_notifier()->NotifyAudioOutputVolumeChanged(
-      0, 0);
+  ash::TrayAudio::ShowPopUpVolumeView();
 }
 
 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);
 
@@ skipping 22 matching lines @@
   }
 
   VLOG(1) << "Send switch state " << switch_state;
   mojom::AudioInstance* audio_instance =
       arc_bridge_service()->audio()->GetInstanceForMethod("NotifySwitchState");
   if (audio_instance)
     audio_instance->NotifySwitchState(switch_state);
 }
 
 }  // namespace arc