Revert of Fix getUserMedia so that failure is reported for invalid audio sources.

content/renderer/media/webrtc/processed_local_audio_source.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/webrtc/processed_local_audio_source.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/stringprintf.h"
 #include "content/renderer/media/audio_device_factory.h"
@@ skipping 11 matching lines @@
 namespace content {
 
 namespace {
 // Used as an identifier for ProcessedLocalAudioSource::From().
 void* const kClassIdentifier = const_cast<void**>(&kClassIdentifier);
 }  // namespace
 
 ProcessedLocalAudioSource::ProcessedLocalAudioSource(
     int consumer_render_frame_id,
     const StreamDeviceInfo& device_info,
-    const blink::WebMediaConstraints& constraints,
-    const ConstraintsCallback& started_callback,
     PeerConnectionDependencyFactory* factory)
     : MediaStreamAudioSource(true /* is_local_source */),
       consumer_render_frame_id_(consumer_render_frame_id),
       pc_factory_(factory),
-      constraints_(constraints),
-      started_callback_(started_callback),
       volume_(0),
       allow_invalid_render_frame_id_for_testing_(false) {
   DCHECK(pc_factory_);
   DVLOG(1) << "ProcessedLocalAudioSource::ProcessedLocalAudioSource()";
   MediaStreamSource::SetDeviceInfo(device_info);
 }
 
 ProcessedLocalAudioSource::~ProcessedLocalAudioSource() {
   DVLOG(1) << "ProcessedLocalAudioSource::~ProcessedLocalAudioSource()";
   EnsureSourceIsStopped();
 }
 
 // static
 ProcessedLocalAudioSource* ProcessedLocalAudioSource::From(
     MediaStreamAudioSource* source) {
   if (source && source->GetClassIdentifier() == kClassIdentifier)
     return static_cast<ProcessedLocalAudioSource*>(source);
   return nullptr;
 }
 
+void ProcessedLocalAudioSource::SetSourceConstraints(
+    const blink::WebMediaConstraints& constraints) {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(!constraints.isNull());
+  DCHECK(!source_);
+  constraints_ = constraints;
+}
+
 void* ProcessedLocalAudioSource::GetClassIdentifier() const {
   return kClassIdentifier;
 }
 
 bool ProcessedLocalAudioSource::EnsureSourceIsStarted() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   {
     base::AutoLock auto_lock(source_lock_);
     if (source_)
@@ skipping 182 matching lines @@
 int ProcessedLocalAudioSource::Volume() const {
   // Note: Using NoBarrier_Load() because the timing of visibility of the
   // updated volume information on other threads can be relaxed.
   return base::subtle::NoBarrier_Load(&volume_);
 }
 
 int ProcessedLocalAudioSource::MaxVolume() const {
   return WebRtcAudioDeviceImpl::kMaxVolumeLevel;
 }
 
-void ProcessedLocalAudioSource::OnCaptureStarted() {
-  started_callback_.Run(this, MEDIA_DEVICE_OK, "");
-}
-
 void ProcessedLocalAudioSource::Capture(const media::AudioBus* audio_bus,
                                         int audio_delay_milliseconds,
                                         double volume,
                                         bool key_pressed) {
 #if defined(OS_WIN) || defined(OS_MACOSX)
   DCHECK_LE(volume, 1.0);
 #elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_OPENBSD)
   // We have a special situation on Linux where the microphone volume can be
   // "higher than maximum". The input volume slider in the sound preference
   // allows the user to set a scaling that is higher than 100%. It means that
@@ skipping 91 matching lines @@
 
   // If the buffer size is missing from the StreamDeviceInfo, provide 10ms as a
   // fall-back.
   //
   // TODO(miu): Identify where/why the buffer size might be missing, fix the
   // code, and then require it here. http://crbug.com/638081
   return (sample_rate / 100);
 }
 
 }  // namespace content