Replace AudioManager::Init() with InitializeOnAudioThread().

media/audio/audio_manager_base.h

 // Copyright (c) 2012 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_MANAGER_BASE_H_
 #define MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_
 
 #include <map>
 #include <string>
 
@@ skipping 19 matching lines @@
 // AudioManagerBase provides AudioManager functions common for all platforms.
 class MEDIA_EXPORT AudioManagerBase : public AudioManager {
  public:
   // Name of the generic "default" device.
   static const char kDefaultDeviceName[];
   // Unique Id of the generic "default" device.
   static const char kDefaultDeviceId[];
 
   virtual ~AudioManagerBase();
 
-  virtual void Init() OVERRIDE;
-
   virtual scoped_refptr<base::MessageLoopProxy> GetMessageLoop() OVERRIDE;
 
   virtual string16 GetAudioInputDeviceModel() OVERRIDE;
 
   virtual bool CanShowAudioInputSettings() OVERRIDE;
   virtual void ShowAudioInputSettings() OVERRIDE;
 
   virtual void GetAudioInputDeviceNames(
       media::AudioDeviceNames* device_names) OVERRIDE;
 
@@ skipping 52 matching lines @@
   AudioManagerBase();
 
   // TODO(dalecurtis): This must change to map both input and output parameters
   // to a single dispatcher, otherwise on a device state change we'll just get
   // the exact same invalid dispatcher.
   typedef std::map<AudioParameters, scoped_refptr<AudioOutputDispatcher>,
                    AudioParameters::Compare>
       AudioOutputDispatchersMap;
 
   // Shuts down the audio thread and releases all the audio output dispatchers
-  // on the audio thread.  All audio streams should be freed before
-  // Shutdown is called.
-  // This must be called in the destructor of the AudioManager<Platform>.
+  // on the audio thread.  All audio streams should be freed before Shutdown()
+  // is called.  This must be called in the destructor of every AudioManagerBase
+  // implementation.
   void Shutdown();
 
-  void ShutdownOnAudioThread();
-
   void SetMaxOutputStreamsAllowed(int max) { max_num_output_streams_ = max; }
 
   // Called by each platform specific AudioManager to notify output state change
   // listeners that a state change has occurred.  Must be called from the audio
   // thread.
   void NotifyAllOutputDeviceChangeListeners();
 
+  // Called on |audio_thread_|'s message loop immediately after construction.
+  virtual void InitializeOnAudioThread();
+
   // Map of cached AudioOutputDispatcher instances.  Must only be touched
   // from the audio thread (no locking).
   AudioOutputDispatchersMap output_dispatchers_;
 
  private:
+  // Called by Shutdown().
+  void ShutdownOnAudioThread();
+
   // Counts the number of active input streams to find out if something else
   // is currently recording in Chrome.
   base::AtomicRefCount num_active_input_streams_;
 
   // Max number of open output streams, modified by
   // SetMaxOutputStreamsAllowed().
   int max_num_output_streams_;
 
   // Max number of open input streams.
   int max_num_input_streams_;
 
   // Number of currently open output streams.
   int num_output_streams_;
 
   // Number of currently open input streams.
   int num_input_streams_;
 
   // Track output state change listeners.
   ObserverList<AudioDeviceListener> output_listeners_;
 
   // Thread used to interact with audio streams created by this audio manager.
   scoped_ptr<base::Thread> audio_thread_;
   mutable base::Lock audio_thread_lock_;
 
-  // The message loop of the audio thread this object runs on.  Set on Init().
-  // Used for internal tasks which run on the audio thread even after Shutdown()
-  // has been started and GetMessageLoop() starts returning NULL.
+  // The message loop of the audio thread this object runs on. Used for internal
+  // tasks which run on the audio thread even after Shutdown() has been started
+  // and GetMessageLoop() starts returning NULL.
   scoped_refptr<base::MessageLoopProxy> message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioManagerBase);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_