Revert r9861 to fix build

media/audio/audio_output.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef MEDIA_AUDIO_AUDIO_OUTPUT_H_
 #define MEDIA_AUDIO_AUDIO_OUTPUT_H_
 
 #include "base/basictypes.h"
 
 // Low-level audio output support. To make sound there are 3 objects involved:
@@ skipping 86 matching lines @@
  protected:
   virtual ~AudioOutputStream() {}
 };
 
 // Manages all audio resources. In particular it owns the AudioOutputStream
 // objects. Provides some convenience functions that avoid the need to provide
 // iterators over the existing streams.
 class AudioManager {
  public:
   enum Format {
-    AUDIO_PCM_LINEAR = 0, // Pulse code modulation means 'raw' amplitude
-                          // samples.
-    AUDIO_PCM_DELTA,      // Delta-encoded pulse code modulation.
-    AUDIO_MOCK,           // Creates a dummy AudioOutputStream object.
-    AUDIO_LAST_FORMAT     // Only used for validation of format.
+    AUDIO_PCM_LINEAR,  // Pulse code modulation means 'raw' amplitude samples.
+    AUDIO_PCM_DELTA,   // Delta-encoded pulse code modulation. 
+    AUDIO_MOCK         // Creates a dummy AudioOutputStream object.
   };
 
   // Telephone quality sample rate, mostly for speech-only audio.
   static const int kTelephoneSampleRate = 8000;
   // CD sampling rate is 44.1 KHz or conveniently 2x2x3x3x5x5x7x7.
   static const int kAudioCDSampleRate = 44100;
   // Digital Audio Tape sample rate.
   static const int kAudioDATSampleRate = 48000;
 
   // Returns true if the OS reports existence of audio devices. This does not
@@ skipping 26 matching lines @@
   // TODO(cpu): Define threading requirements for interacting with AudioManager.
   static AudioManager* GetAudioManager();
 
  protected:
   virtual ~AudioManager() {}
 };
 
 
 #endif  // MEDIA_AUDIO_AUDIO_OUTPUT_H_