Merge 189983 "Add speaker on/off control on Android for WebRTC "

media/audio/audio_manager_base.h

Index: media/audio/audio_manager_base.h
===================================================================
--- media/audio/audio_manager_base.h	(revision 190471)
+++ media/audio/audio_manager_base.h	(working copy)
@@ -146,7 +146,11 @@
   // Called by Shutdown().
   void ShutdownOnAudioThread();
 
+#if defined(OS_ANDROID)
   void SetAudioMode(int mode);
+  void RegisterHeadsetReceiver();
+  void UnregisterHeadsetReceiver();
+#endif
 
   // Counts the number of active input streams to find out if something else
   // is currently recording in Chrome.
@@ -182,6 +186,11 @@
   // data to this virtual input stream.
   VirtualAudioInputStream* virtual_audio_input_stream_;
 
+#if defined(OS_ANDROID)
+  // Java AudioManager instance.
+  base::android::ScopedJavaGlobalRef<jobject> j_audio_manager_;
+#endif
+
   DISALLOW_COPY_AND_ASSIGN(AudioManagerBase);
 };