chromeos: Combine TrayAudio and TrayAudioChromeOs classes

ash/common/system/chromeos/audio/volume_view.cc

Index: ash/common/system/chromeos/audio/volume_view.cc
diff --git a/ash/common/system/audio/volume_view.cc b/ash/common/system/chromeos/audio/volume_view.cc
similarity index 97%
rename from ash/common/system/audio/volume_view.cc
rename to ash/common/system/chromeos/audio/volume_view.cc
index ffb8cc0c3603a094337b32331524c4a6b98b75ec..85986651c26db4e222e6d5f6f2c41ad97f4cd1e4 100644
--- a/ash/common/system/audio/volume_view.cc
+++ b/ash/common/system/chromeos/audio/volume_view.cc
@@ -2,13 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/common/system/audio/volume_view.h"
+#include "ash/common/system/chromeos/audio/volume_view.h"
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/metrics/user_metrics_action.h"
-#include "ash/common/system/audio/tray_audio.h"
-#include "ash/common/system/audio/tray_audio_delegate.h"
+#include "ash/common/system/chromeos/audio/tray_audio_delegate.h"
 #include "ash/common/system/tray/system_tray_item.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_item_container.h"
@@ -239,8 +238,7 @@ void VolumeView::SetVolumeLevel(float percent) {
 }
 
 void VolumeView::UpdateDeviceTypeAndMore() {
-  bool show_more = is_default_view_ && TrayAudio::ShowAudioDeviceMenu() &&
-                   audio_delegate_->HasAlternativeSources();
+  bool show_more = is_default_view_ && audio_delegate_->HasAlternativeSources();
   if (!ash::MaterialDesignController::IsSystemTrayMenuMaterial()) {
     slider_->SetBorder(views::CreateEmptyBorder(
         0, 0, 0, show_more ? kTrayPopupPaddingBetweenItems