Revert 190475 "Merge 189983 "Add speaker on/off control on Andro..."

media/audio/audio_manager_base.cc

Index: media/audio/audio_manager_base.cc
===================================================================
--- media/audio/audio_manager_base.cc	(revision 191282)
+++ media/audio/audio_manager_base.cc	(working copy)
@@ -66,13 +66,6 @@
   CHECK(audio_thread_->Start());
 #endif
   message_loop_ = audio_thread_->message_loop_proxy();
-
-#if defined(OS_ANDROID)
-  JNIEnv* env = base::android::AttachCurrentThread();
-  jobject context = base::android::GetApplicationContext();
-  j_audio_manager_.Reset(
-      Java_AudioManagerAndroid_createAudioManagerAndroid(env, context));
-#endif
 }
 
 AudioManagerBase::~AudioManagerBase() {
@@ -139,13 +132,8 @@
     stream = MakeLowLatencyOutputStream(params);
   }
 
-  if (stream) {
+  if (stream)
     ++num_output_streams_;
-#if defined(OS_ANDROID)
-    if (num_output_streams_ == 1)
-      RegisterHeadsetReceiver();
-#endif
-  }
 
   return stream;
 }
@@ -210,13 +198,13 @@
     stream = MakeLowLatencyInputStream(params, device_id);
   }
 
-  if (stream) {
+  if (stream)
     ++num_input_streams_;
+
 #if defined(OS_ANDROID)
-    if (num_input_streams_ == 1)
-      SetAudioMode(kAudioModeInCommunication);
+  if (num_input_streams_ == 1)
+    SetAudioMode(kAudioModeInCommunication);
 #endif
-  }
 
   return stream;
 }
@@ -310,10 +298,6 @@
   // streams.
   --num_output_streams_;
   delete stream;
-#if defined(OS_ANDROID)
-  if (!num_output_streams_)
-    UnregisterHeadsetReceiver();
-#endif
 }
 
 void AudioManagerBase::ReleaseInputStream(AudioInputStream* stream) {
@@ -456,22 +440,12 @@
 
 #if defined(OS_ANDROID)
 void AudioManagerBase::SetAudioMode(int mode) {
-  Java_AudioManagerAndroid_setMode(
-      base::android::AttachCurrentThread(),
-      j_audio_manager_.obj(), mode);
-}
+  JNIEnv* env = base::android::AttachCurrentThread();
+  jobject context = base::android::GetApplicationContext();
+  DCHECK(context);
 
-void AudioManagerBase::RegisterHeadsetReceiver() {
-  Java_AudioManagerAndroid_registerHeadsetReceiver(
-      base::android::AttachCurrentThread(),
-      j_audio_manager_.obj());
+  Java_AudioManagerAndroid_setMode(env, context, mode);
 }
+#endif
 
-void AudioManagerBase::UnregisterHeadsetReceiver() {
-  Java_AudioManagerAndroid_unregisterHeadsetReceiver(
-      base::android::AttachCurrentThread(),
-      j_audio_manager_.obj());
-}
-#endif  // defined(OS_ANDROID)
-
 }  // namespace media