chromeos: Combine TrayAudio and TrayAudioChromeOs classes

ash/common/system/chromeos/audio/tray_audio_delegate.h

Index: ash/common/system/chromeos/audio/tray_audio_delegate.h
diff --git a/ash/common/system/audio/tray_audio_delegate.h b/ash/common/system/chromeos/audio/tray_audio_delegate.h
similarity index 91%
rename from ash/common/system/audio/tray_audio_delegate.h
rename to ash/common/system/chromeos/audio/tray_audio_delegate.h
index a824ebf055c0b802072b06d46e53f76b2456afba..4d5e343d787dcd1c620cb98ccb507532b532ef04 100644
--- a/ash/common/system/audio/tray_audio_delegate.h
+++ b/ash/common/system/chromeos/audio/tray_audio_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_COMMON_SYSTEM_AUDIO_TRAY_AUDIO_DELEGATE_H_
-#define ASH_COMMON_SYSTEM_AUDIO_TRAY_AUDIO_DELEGATE_H_
+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_DELEGATE_H_
+#define ASH_COMMON_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_DELEGATE_H_
 
 namespace gfx {
 struct VectorIcon;
@@ -12,7 +12,7 @@ struct VectorIcon;
 namespace ash {
 namespace system {
 
-class ASH_EXPORT TrayAudioDelegate {
+class TrayAudioDelegate {
  public:
   enum { kNoAudioDeviceIcon = -1 };
   enum AudioChannelMode {
@@ -69,4 +69,4 @@ class ASH_EXPORT TrayAudioDelegate {
 }  // namespace system
 }  // namespace ash
 
-#endif  // ASH_COMMON_SYSTEM_AUDIO_TRAY_AUDIO_DELEGATE_H_
+#endif  // ASH_COMMON_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_DELEGATE_H_