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

content/renderer/media/webrtc/processed_local_audio_source_unittest.cc

 // Copyright 2016 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 <memory>
 #include <string>
 
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "build/build_config.h"
@@ skipping 84 matching lines @@
     blink::WebHeap::collectAllGarbageForTesting();
   }
 
   void CreateProcessedLocalAudioSource(
       const blink::WebMediaConstraints& constraints) {
     ProcessedLocalAudioSource* const source = new ProcessedLocalAudioSource(
         -1 /* consumer_render_frame_id is N/A for non-browser tests */,
         StreamDeviceInfo(MEDIA_DEVICE_AUDIO_CAPTURE, "Mock audio device",
                          "mock_audio_device_id", kSampleRate, kChannelLayout,
                          kRequestedBufferSize),
-        constraints,
-        base::Bind(&ProcessedLocalAudioSourceTest::OnAudioSourceStarted,
-                   base::Unretained(this)),
         &mock_dependency_factory_);
     source->SetAllowInvalidRenderFrameIdForTesting(true);
+    source->SetSourceConstraints(constraints);
     blink_audio_source_.setExtraData(source);  // Takes ownership.
   }
 
   void CheckSourceFormatMatches(const media::AudioParameters& params) {
     EXPECT_EQ(kSampleRate, params.sample_rate());
     EXPECT_EQ(kChannelLayout, params.channel_layout());
     EXPECT_EQ(kExpectedSourceBufferSize, params.frames_per_buffer());
   }
 
   void CheckOutputFormatMatches(const media::AudioParameters& params) {
@@ skipping 12 matching lines @@
   }
 
   MediaStreamAudioSource* audio_source() const {
     return MediaStreamAudioSource::From(blink_audio_source_);
   }
 
   const blink::WebMediaStreamTrack& blink_audio_track() {
     return blink_audio_track_;
   }
 
-  void OnAudioSourceStarted(MediaStreamSource* source,
-                            MediaStreamRequestResult result,
-                            const blink::WebString& result_name) {}
-
  private:
   base::MessageLoop main_thread_message_loop_;  // Needed for MSAudioProcessor.
   MockAudioDeviceFactory mock_audio_device_factory_;
   MockPeerConnectionDependencyFactory mock_dependency_factory_;
   blink::WebMediaStreamSource blink_audio_source_;
   blink::WebMediaStreamTrack blink_audio_track_;
 };
 
 // Tests a basic end-to-end start-up, track+sink connections, audio flow, and
 // shut-down. The unit tests in media_stream_audio_unittest.cc provide more
@@ skipping 11 matching lines @@
   CreateProcessedLocalAudioSource(
       constraint_factory.CreateWebMediaConstraints());
 
   // Connect the track, and expect the MockCapturerSource to be initialized and
   // started by ProcessedLocalAudioSource.
   EXPECT_CALL(*mock_audio_device_factory()->mock_capturer_source(),
               Initialize(_, capture_source_callback(), -1))
       .WillOnce(WithArg<0>(Invoke(this, &ThisTest::CheckSourceFormatMatches)));
   EXPECT_CALL(*mock_audio_device_factory()->mock_capturer_source(),
               SetAutomaticGainControl(true));
-  EXPECT_CALL(*mock_audio_device_factory()->mock_capturer_source(), Start())
-      .WillOnce(Invoke(
-          capture_source_callback(),
-          &media::AudioCapturerSource::CaptureCallback::OnCaptureStarted));
+  EXPECT_CALL(*mock_audio_device_factory()->mock_capturer_source(), Start());
   ASSERT_TRUE(audio_source()->ConnectToTrack(blink_audio_track()));
   CheckOutputFormatMatches(audio_source()->GetAudioParameters());
 
   // Connect a sink to the track.
   std::unique_ptr<MockMediaStreamAudioSink> sink(
       new MockMediaStreamAudioSink());
   EXPECT_CALL(*sink, FormatIsSet(_))
       .WillOnce(Invoke(this, &ThisTest::CheckOutputFormatMatches));
   MediaStreamAudioTrack::From(blink_audio_track())->AddSink(sink.get());
 
@@ skipping 40 matching lines @@
   // Even though ConnectToTrack() failed, there should still have been a new
   // MediaStreamAudioTrack instance created, owned by the
   // blink::WebMediaStreamTrack.
   EXPECT_TRUE(MediaStreamAudioTrack::From(blink_audio_track()));
 }
 
 // TODO(miu): There's a lot of logic in ProcessedLocalAudioSource around
 // constraints processing and validation that should have unit testing.
 
 }  // namespace content