13 files changed, 1 insertions, 49 deletions
diff --git a/content/browser/speech/speech_recognition_manager_impl.cc b/content/browser/speech/speech_recognition_manager_impl.cc
index d20b989..078cafa 100644
--- a/content/browser/speech/speech_recognition_manager_impl.cc
+++ b/content/browser/speech/speech_recognition_manager_impl.cc
@@ -34,10 +34,7 @@ SpeechRecognitionManagerImpl* g_speech_recognition_manager_impl;
 
 void ShowAudioInputSettingsOnFileThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  media::AudioManager* audio_manager = BrowserMainLoop::GetAudioManager();
-  DCHECK(audio_manager->CanShowAudioInputSettings());
-  if (audio_manager->CanShowAudioInputSettings())
-    audio_manager->ShowAudioInputSettings();
+  BrowserMainLoop::GetAudioManager()->ShowAudioInputSettings();
 }
 
 }  // namespace
diff --git a/media/audio/android/audio_manager_android.cc b/media/audio/android/audio_manager_android.cc
index 98dd34a..93296d7 100644
--- a/media/audio/android/audio_manager_android.cc
+++ b/media/audio/android/audio_manager_android.cc
@@ -36,10 +36,6 @@ bool AudioManagerAndroid::HasAudioInputDevices() {
   return true;
 }
 
-bool AudioManagerAndroid::CanShowAudioInputSettings() {
-  return false;
-}
-
 void AudioManagerAndroid::GetAudioInputDeviceNames(
     media::AudioDeviceNames* device_names) {
   DCHECK(device_names->empty());
diff --git a/media/audio/android/audio_manager_android.h b/media/audio/android/audio_manager_android.h
index 440d762..2c8f7ac 100644
--- a/media/audio/android/audio_manager_android.h
+++ b/media/audio/android/audio_manager_android.h
@@ -17,7 +17,6 @@ class MEDIA_EXPORT AudioManagerAndroid : public AudioManagerBase {
   // Implementation of AudioManager.
   virtual bool HasAudioOutputDevices() OVERRIDE;
   virtual bool HasAudioInputDevices() OVERRIDE;
-  virtual bool CanShowAudioInputSettings() OVERRIDE;
   virtual void GetAudioInputDeviceNames(media::AudioDeviceNames* device_names)
       OVERRIDE;
 
diff --git a/media/audio/audio_manager.h b/media/audio/audio_manager.h
index ca4c468..f169b41 100644
--- a/media/audio/audio_manager.h
+++ b/media/audio/audio_manager.h
@@ -48,10 +48,6 @@ class MEDIA_EXPORT AudioManager {
   // input device for this computer.
   virtual string16 GetAudioInputDeviceModel() = 0;
 
-  // Returns true if the platform specific audio input settings UI is known
-  // and can be shown.
-  virtual bool CanShowAudioInputSettings() = 0;
-
   // Opens the platform default audio input settings UI.
   // Note: This could invoke an external application/preferences pane, so
   // ideally must not be called from the UI thread or other time sensitive
diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc
index b453877..75d20fc7 100644
--- a/media/audio/audio_manager_base.cc
+++ b/media/audio/audio_manager_base.cc
@@ -273,10 +273,6 @@ AudioOutputStream* AudioManagerBase::MakeAudioOutputStreamProxy(
 #endif  // defined(OS_IOS)
 }
 
-bool AudioManagerBase::CanShowAudioInputSettings() {
-  return false;
-}
-
 void AudioManagerBase::ShowAudioInputSettings() {
 }
 
diff --git a/media/audio/audio_manager_base.h b/media/audio/audio_manager_base.h
index 2568e25..a76c058 100644
--- a/media/audio/audio_manager_base.h
+++ b/media/audio/audio_manager_base.h
@@ -44,7 +44,6 @@ class MEDIA_EXPORT AudioManagerBase : public AudioManager {
 
   virtual string16 GetAudioInputDeviceModel() OVERRIDE;
 
-  virtual bool CanShowAudioInputSettings() OVERRIDE;
   virtual void ShowAudioInputSettings() OVERRIDE;
 
   virtual void GetAudioInputDeviceNames(
diff --git a/media/audio/audio_output_proxy_unittest.cc b/media/audio/audio_output_proxy_unittest.cc
index fc0cd26..3f5cceb9 100644
--- a/media/audio/audio_output_proxy_unittest.cc
+++ b/media/audio/audio_output_proxy_unittest.cc
@@ -103,7 +103,6 @@ class MockAudioManager : public AudioManagerBase {
       const AudioParameters& params));
   MOCK_METHOD2(MakeAudioInputStream, AudioInputStream*(
       const AudioParameters& params, const std::string& device_id));
-  MOCK_METHOD0(CanShowAudioInputSettings, bool());
   MOCK_METHOD0(ShowAudioInputSettings, void());
   MOCK_METHOD0(GetMessageLoop, scoped_refptr<base::MessageLoopProxy>());
   MOCK_METHOD1(GetAudioInputDeviceNames, void(
diff --git a/media/audio/linux/audio_manager_linux.cc b/media/audio/linux/audio_manager_linux.cc
index ff6cbbd..3387d56 100644
--- a/media/audio/linux/audio_manager_linux.cc
+++ b/media/audio/linux/audio_manager_linux.cc
@@ -69,24 +69,6 @@ AudioManagerLinux::~AudioManagerLinux() {
   Shutdown();
 }
 
-bool AudioManagerLinux::CanShowAudioInputSettings() {
-  scoped_ptr<base::Environment> env(base::Environment::Create());
-
-  switch (base::nix::GetDesktopEnvironment(env.get())) {
-    case base::nix::DESKTOP_ENVIRONMENT_GNOME:
-    case base::nix::DESKTOP_ENVIRONMENT_KDE3:
-    case base::nix::DESKTOP_ENVIRONMENT_KDE4:
-    case base::nix::DESKTOP_ENVIRONMENT_UNITY:
-      return true;
-    case base::nix::DESKTOP_ENVIRONMENT_OTHER:
-    case base::nix::DESKTOP_ENVIRONMENT_XFCE:
-      return false;
-  }
-  // Unless GetDesktopEnvironment() badly misbehaves, this should never happen.
-  NOTREACHED();
-  return false;
-}
-
 void AudioManagerLinux::ShowAudioInputSettings() {
   scoped_ptr<base::Environment> env(base::Environment::Create());
   CommandLine command_line(CommandLine::NO_PROGRAM);
diff --git a/media/audio/linux/audio_manager_linux.h b/media/audio/linux/audio_manager_linux.h
index 7aab32a..cbcfe62 100644
--- a/media/audio/linux/audio_manager_linux.h
+++ b/media/audio/linux/audio_manager_linux.h
@@ -22,7 +22,6 @@ class MEDIA_EXPORT AudioManagerLinux : public AudioManagerBase {
   // Implementation of AudioManager.
   virtual bool HasAudioOutputDevices() OVERRIDE;
   virtual bool HasAudioInputDevices() OVERRIDE;
-  virtual bool CanShowAudioInputSettings() OVERRIDE;
   virtual void ShowAudioInputSettings() OVERRIDE;
   virtual void GetAudioInputDeviceNames(media::AudioDeviceNames* device_names)
       OVERRIDE;
diff --git a/media/audio/mock_audio_manager.cc b/media/audio/mock_audio_manager.cc
index 9a40b65..4cd5f21 100644
--- a/media/audio/mock_audio_manager.cc
+++ b/media/audio/mock_audio_manager.cc
@@ -28,10 +28,6 @@ string16 MockAudioManager::GetAudioInputDeviceModel() {
   return string16();
 }
 
-bool MockAudioManager::CanShowAudioInputSettings() {
-  return false;
-}
-
 void MockAudioManager::ShowAudioInputSettings() {
 }
 
diff --git a/media/audio/mock_audio_manager.h b/media/audio/mock_audio_manager.h
index 6a94055..1046c8c 100644
--- a/media/audio/mock_audio_manager.h
+++ b/media/audio/mock_audio_manager.h
@@ -29,8 +29,6 @@ class MockAudioManager : public media::AudioManager {
 
   virtual string16 GetAudioInputDeviceModel() OVERRIDE;
 
-  virtual bool CanShowAudioInputSettings() OVERRIDE;
-
   virtual void ShowAudioInputSettings() OVERRIDE;
 
   virtual void GetAudioInputDeviceNames(
diff --git a/media/audio/win/audio_manager_win.cc b/media/audio/win/audio_manager_win.cc
index dc24ece..82dda90 100644
--- a/media/audio/win/audio_manager_win.cc
+++ b/media/audio/win/audio_manager_win.cc
@@ -215,10 +215,6 @@ string16 AudioManagerWin::GetAudioInputDeviceModel() {
   return string16();
 }
 
-bool AudioManagerWin::CanShowAudioInputSettings() {
-  return true;
-}
-
 void AudioManagerWin::ShowAudioInputSettings() {
   std::wstring program;
   std::string argument;
diff --git a/media/audio/win/audio_manager_win.h b/media/audio/win/audio_manager_win.h
index 4ce2fbc..bb8f395 100644
--- a/media/audio/win/audio_manager_win.h
+++ b/media/audio/win/audio_manager_win.h
@@ -24,7 +24,6 @@ class MEDIA_EXPORT AudioManagerWin : public AudioManagerBase {
   virtual bool HasAudioOutputDevices() OVERRIDE;
   virtual bool HasAudioInputDevices() OVERRIDE;
   virtual string16 GetAudioInputDeviceModel() OVERRIDE;
-  virtual bool CanShowAudioInputSettings() OVERRIDE;
   virtual void ShowAudioInputSettings() OVERRIDE;
   virtual void GetAudioInputDeviceNames(media::AudioDeviceNames* device_names)
       OVERRIDE;