Check if ChromeOS keyboard mic is available directly in GetInputStreamParameters().

Removes a bunch of functions + thread hops at first stream start.

BUG=511113

Review URL: https://codereview.chromium.org/1517233002

Cr-Commit-Position: refs/heads/master@{#366056}

7 files changed, 1 insertions, 24 deletions

diff --git a/media/audio/audio_manager.h b/media/audio/audio_manager.h
index 6ee4f6d..858654f 100644
--- a/media/audio/audio_manager.h
+++ b/media/audio/audio_manager.h
@@ -224,11 +224,6 @@ class MEDIA_EXPORT AudioManager {
   virtual scoped_ptr<AudioLog> CreateAudioLog(
       AudioLogFactory::AudioComponent component) = 0;
 
-  // Informs the audio manager that the system has support for a keyboard mic.
-  // This information will be passed on in the return value of
-  // GetInputStreamParameters as an effect. Only supported on ChromeOS.
-  virtual void SetHasKeyboardMic() = 0;
-
  protected:
   AudioManager();
 
diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc
index 73ed1cf..fadd3fe 100644
--- a/media/audio/audio_manager_base.cc
+++ b/media/audio/audio_manager_base.cc
@@ -414,8 +414,4 @@ scoped_ptr<AudioLog> AudioManagerBase::CreateAudioLog(
   return audio_log_factory_->CreateAudioLog(component);
 }
 
-void AudioManagerBase::SetHasKeyboardMic() {
-  NOTREACHED();
-}
-
 }  // namespace media
diff --git a/media/audio/audio_manager_base.h b/media/audio/audio_manager_base.h
index cd94713..a0272f3 100644
--- a/media/audio/audio_manager_base.h
+++ b/media/audio/audio_manager_base.h
@@ -78,7 +78,6 @@ class MEDIA_EXPORT AudioManagerBase : public AudioManager {
       const std::string& input_device_id) override;
   scoped_ptr<AudioLog> CreateAudioLog(
       AudioLogFactory::AudioComponent component) override;
-  void SetHasKeyboardMic() override;
 
   // AudioManagerBase:
 
diff --git a/media/audio/cras/audio_manager_cras.cc b/media/audio/cras/audio_manager_cras.cc
index e872ada..036f6fd 100644
--- a/media/audio/cras/audio_manager_cras.cc
+++ b/media/audio/cras/audio_manager_cras.cc
@@ -135,7 +135,6 @@ bool AudioManagerCras::HasAudioInputDevices() {
 
 AudioManagerCras::AudioManagerCras(AudioLogFactory* audio_log_factory)
     : AudioManagerBase(audio_log_factory),
-      has_keyboard_mic_(false),
       beamforming_on_device_id_(nullptr),
       beamforming_off_device_id_(nullptr) {
   SetMaxOutputStreamsAllowed(kMaxOutputStreams);
@@ -181,7 +180,7 @@ AudioParameters AudioManagerCras::GetInputStreamParameters(
   AudioParameters params(AudioParameters::AUDIO_PCM_LOW_LATENCY,
                          CHANNEL_LAYOUT_STEREO, kDefaultSampleRate, 16,
                          buffer_size);
-  if (has_keyboard_mic_)
+  if (chromeos::CrasAudioHandler::Get()->HasKeyboardMic())
     params.set_effects(AudioParameters::KEYBOARD_MIC);
 
   if (mic_positions_.size() > 1) {
@@ -212,11 +211,6 @@ AudioParameters AudioManagerCras::GetInputStreamParameters(
   return params;
 }
 
-void AudioManagerCras::SetHasKeyboardMic() {
-  DCHECK(GetTaskRunner()->BelongsToCurrentThread());
-  has_keyboard_mic_ = true;
-}
-
 AudioOutputStream* AudioManagerCras::MakeLinearOutputStream(
     const AudioParameters& params) {
   DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
diff --git a/media/audio/cras/audio_manager_cras.h b/media/audio/cras/audio_manager_cras.h
index fbe0102..91e763e 100644
--- a/media/audio/cras/audio_manager_cras.h
+++ b/media/audio/cras/audio_manager_cras.h
@@ -27,7 +27,6 @@ class MEDIA_EXPORT AudioManagerCras : public AudioManagerBase {
   void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
   AudioParameters GetInputStreamParameters(
       const std::string& device_id) override;
-  void SetHasKeyboardMic() override;
 
   // AudioManagerBase implementation.
   AudioOutputStream* MakeLinearOutputStream(
@@ -61,8 +60,6 @@ class MEDIA_EXPORT AudioManagerCras : public AudioManagerBase {
 
   void AddBeamformingDevices(AudioDeviceNames* device_names);
 
-  bool has_keyboard_mic_;
-
   // Stores the mic positions field from the device.
   std::vector<Point> mic_positions_;
 
diff --git a/media/audio/mock_audio_manager.cc b/media/audio/mock_audio_manager.cc
index 5cf00d1..7183405 100644
--- a/media/audio/mock_audio_manager.cc
+++ b/media/audio/mock_audio_manager.cc
@@ -104,6 +104,4 @@ scoped_ptr<AudioLog> MockAudioManager::CreateAudioLog(
   return scoped_ptr<AudioLog>();
 }
 
-void MockAudioManager::SetHasKeyboardMic() {}
-
 }  // namespace media.
diff --git a/media/audio/mock_audio_manager.h b/media/audio/mock_audio_manager.h
index dcae43b..ae6f0d6 100644
--- a/media/audio/mock_audio_manager.h
+++ b/media/audio/mock_audio_manager.h
@@ -66,8 +66,6 @@ class MockAudioManager : public media::AudioManager {
   scoped_ptr<AudioLog> CreateAudioLog(
       AudioLogFactory::AudioComponent component) override;
 
-  void SetHasKeyboardMic() override;
-
  protected:
   ~MockAudioManager() override;