Revert 251959 "Refactor the TrayAudio code so that it can be use..."

trunk/src/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Index: trunk/src/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
===================================================================
--- trunk/src/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc	(revision 252005)
+++ trunk/src/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc	(working copy)
@@ -314,9 +314,6 @@
 
   if (LoginState::IsInitialized())
     LoginState::Get()->AddObserver(this);
-
-  if (CrasAudioHandler::IsInitialized())
-    CrasAudioHandler::Get()->AddAudioObserver(this);
 }
 
 void SystemTrayDelegateChromeOS::Shutdown() {
@@ -372,10 +369,7 @@
       ->RemoveSessionStateObserver(this);
   LoginState::Get()->RemoveObserver(this);
 
-  if (CrasAudioHandler::IsInitialized())
-    CrasAudioHandler::Get()->RemoveAudioObserver(this);
-
-// Stop observing Drive operations.
+  // Stop observing Drive operations.
   UnobserveDriveUpdates();
 
   policy::BrowserPolicyConnectorChromeOS* connector =
@@ -1216,33 +1210,6 @@
   GetSystemTrayNotifier()->NotifyRefreshIME(false);
 }
 
-// Overridden from CrasAudioHandler::AudioObserver.
-void SystemTrayDelegateChromeOS::OnOutputVolumeChanged() {
-  GetSystemTrayNotifier()->NotifyAudioOutputVolumeChanged();
-}
-
-void SystemTrayDelegateChromeOS::OnOutputMuteChanged() {
-  GetSystemTrayNotifier()->NotifyAudioOutputMuteChanged();
-}
-
-void SystemTrayDelegateChromeOS::OnInputGainChanged() {
-}
-
-void SystemTrayDelegateChromeOS::OnInputMuteChanged() {
-}
-
-void SystemTrayDelegateChromeOS::OnAudioNodesChanged() {
-  GetSystemTrayNotifier()->NotifyAudioNodesChanged();
-}
-
-void SystemTrayDelegateChromeOS::OnActiveOutputNodeChanged() {
-  GetSystemTrayNotifier()->NotifyAudioActiveOutputNodeChanged();
-}
-
-void SystemTrayDelegateChromeOS::OnActiveInputNodeChanged() {
-  GetSystemTrayNotifier()->NotifyAudioActiveInputNodeChanged();
-}
-
 // drive::JobListObserver overrides.
 void SystemTrayDelegateChromeOS::OnJobAdded(const drive::JobInfo& job_info) {
   OnJobUpdated(job_info);