mash: Migrate tray audio and deps to common.

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/shell.h"
-#include "ash/system/tray/system_tray_notifier.h"
+#include "ash/common/system/tray/wm_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);
   if (chromeos::CrasAudioHandler::IsInitialized()) {
     cras_audio_handler_ = chromeos::CrasAudioHandler::Get();
@@ skipping 18 matching lines @@
   }
   if (arc_bridge_service()->audio_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::Shell::GetInstance()->system_tray_notifier()->
+  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);
@@ skipping 22 matching lines @@
         (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();
   if (audio_instance)
     audio_instance->NotifySwitchState(switch_state);
 }
 
 }  // namespace arc