Refactor android specific code in AudioManagerBase class.

media/audio/android/audio_manager_android.h

Index: media/audio/android/audio_manager_android.h
===================================================================
--- media/audio/android/audio_manager_android.h	(revision 194203)
+++ media/audio/android/audio_manager_android.h	(working copy)
@@ -5,6 +5,7 @@
 #ifndef MEDIA_AUDIO_ANDROID_AUDIO_MANAGER_ANDROID_H_
 #define MEDIA_AUDIO_ANDROID_AUDIO_MANAGER_ANDROID_H_
 
+#include "base/android/jni_android.h"
 #include "media/audio/audio_manager_base.h"
 
 namespace media {
@@ -22,6 +23,13 @@
   virtual AudioParameters GetInputStreamParameters(
       const std::string& device_id) OVERRIDE;
 
+  virtual AudioOutputStream* MakeAudioOutputStream(
+      const AudioParameters& params) OVERRIDE;
+  virtual AudioInputStream* MakeAudioInputStream(
+      const AudioParameters& params, const std::string& device_id) OVERRIDE;
+  virtual void ReleaseOutputStream(AudioOutputStream* stream);

[DaleCurtis, 2013/04/15 21:02:30]

Missing OVERRIDE here and on the next line.

[leozwang1, 2013/04/15 21:12:15]

Done.

+  virtual void ReleaseInputStream(AudioInputStream* stream);
+
   // Implementation of AudioManagerBase.
   virtual AudioOutputStream* MakeLinearOutputStream(
       const AudioParameters& params) OVERRIDE;
@@ -32,6 +40,8 @@
   virtual AudioInputStream* MakeLowLatencyInputStream(
       const AudioParameters& params, const std::string& device_id) OVERRIDE;
 
+  static bool RegisterAudioManager(JNIEnv* env);
+
  protected:
   virtual ~AudioManagerAndroid();
 
@@ -39,6 +49,13 @@
       const AudioParameters& input_params) OVERRIDE;
 
  private:
+  void SetAudioMode(int mode);
+  void RegisterHeadsetReceiver();
+  void UnregisterHeadsetReceiver();
+
+  // Java AudioManager instance.
+  base::android::ScopedJavaGlobalRef<jobject> j_audio_manager_;
+
   DISALLOW_COPY_AND_ASSIGN(AudioManagerAndroid);
 };