Revert of Add a media constraint to enable beamforming.

content/renderer/media/media_stream_audio_processor.cc

Index: content/renderer/media/media_stream_audio_processor.cc
diff --git a/content/renderer/media/media_stream_audio_processor.cc b/content/renderer/media/media_stream_audio_processor.cc
index 7e3f08d45b1c3c4bb3f8a3a5e50b93ee1bc5330d..81dec9130df16858a8e525190bb4c72f63d4515c 100644
--- a/content/renderer/media/media_stream_audio_processor.cc
+++ b/content/renderer/media/media_stream_audio_processor.cc
@@ -19,10 +19,6 @@
 #include "third_party/WebKit/public/platform/WebMediaConstraints.h"
 #include "third_party/libjingle/source/talk/app/webrtc/mediaconstraintsinterface.h"
 #include "third_party/webrtc/modules/audio_processing/typing_detection.h"
-
-#if defined(OS_CHROMEOS)
-#include "base/sys_info.h"
-#endif
 
 namespace content {
 
@@ -449,15 +445,13 @@
       MediaAudioConstraints::kGoogNoiseSuppression);
   const bool goog_experimental_ns = audio_constraints.GetProperty(
       MediaAudioConstraints::kGoogExperimentalNoiseSuppression);
-  const bool goog_beamforming = audio_constraints.GetProperty(
-      MediaAudioConstraints::kGoogBeamforming);
  const bool goog_high_pass_filter = audio_constraints.GetProperty(
      MediaAudioConstraints::kGoogHighpassFilter);
 
   // Return immediately if no goog constraint is enabled.
   if (!echo_cancellation && !goog_experimental_aec && !goog_ns &&
       !goog_high_pass_filter && !goog_typing_detection &&
-      !goog_agc && !goog_experimental_ns && !goog_beamforming) {
+      !goog_agc && !goog_experimental_ns) {
     RecordProcessingState(AUDIO_PROCESSING_DISABLED);
     return;
   }
@@ -472,9 +466,6 @@
   if (base::FieldTrialList::FindFullName("NoReportedDelayOnMac") == "Enabled")
     config.Set<webrtc::ReportedDelay>(new webrtc::ReportedDelay(false));
 #endif
-  if (goog_beamforming) {
-    ConfigureBeamforming(&config);
-  }
 
   // Create and configure the webrtc::AudioProcessing.
   audio_processing_.reset(webrtc::AudioProcessing::Create(config));
@@ -508,23 +499,6 @@
     EnableAutomaticGainControl(audio_processing_.get());
 
   RecordProcessingState(AUDIO_PROCESSING_ENABLED);
-}
-
-void MediaStreamAudioProcessor::ConfigureBeamforming(webrtc::Config* config) {
-  bool enabled = false;
-  std::vector<webrtc::Point> geometry(1, webrtc::Point(0.f, 0.f, 0.f));
-#if defined(OS_CHROMEOS)
-  const std::string board = base::SysInfo::GetLsbReleaseBoard();
-  if (board == "peach_pi") {
-    enabled = true;
-    geometry.push_back(webrtc::Point(0.050f, 0.f, 0.f));
-  } else if (board == "swanky") {
-    // TODO(aluebs): Verify beamforming works on Swanky and enable.
-    enabled = false;
-    geometry.push_back(webrtc::Point(0.052f, 0.f, 0.f));
-  }
-#endif
-  config->Set<webrtc::Beamforming>(new webrtc::Beamforming(enabled, geometry));
 }
 
 void MediaStreamAudioProcessor::InitializeCaptureFifo(