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

content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc

 // Copyright 2014 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/webrtc_media_stream_adapter.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 40 matching lines @@
                               blink::WebMediaStreamSource::TypeAudio,
                               "audio",
                               false /* remote */);
       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",
                            media::AudioParameters::kAudioCDSampleRate,
                            media::CHANNEL_LAYOUT_STEREO,
                            media::AudioParameters::kAudioCDSampleRate / 50),
-          MockConstraintFactory().CreateWebMediaConstraints(),
-          base::Bind(&WebRtcMediaStreamAdapterTest::OnAudioSourceStarted),
           dependency_factory_.get());
       source->SetAllowInvalidRenderFrameIdForTesting(true);
+      source->SetSourceConstraints(
+          MockConstraintFactory().CreateWebMediaConstraints());
       audio_source.setExtraData(source);  // Takes ownership.
       audio_track_vector[0].initialize(audio_source);
       EXPECT_CALL(*mock_audio_device_factory_.mock_capturer_source(),
                   Initialize(_, _, -1));
       EXPECT_CALL(*mock_audio_device_factory_.mock_capturer_source(),
                   SetAutomaticGainControl(true));
       EXPECT_CALL(*mock_audio_device_factory_.mock_capturer_source(), Start());
       EXPECT_CALL(*mock_audio_device_factory_.mock_capturer_source(), Stop());
       CHECK(source->ConnectToTrack(audio_track_vector[0]));
     }
@@ skipping 37 matching lines @@
               adapter_->webrtc_media_stream()->GetVideoTracks().size());
     EXPECT_EQ(blink_stream.id().utf8(),
               adapter_->webrtc_media_stream()->label());
   }
 
   webrtc::MediaStreamInterface* webrtc_stream() {
     return adapter_->webrtc_media_stream();
   }
 
  private:
-  static void OnAudioSourceStarted(MediaStreamSource* source,
-                                   MediaStreamRequestResult result,
-                                   const blink::WebString& result_name) {}
-
   base::MessageLoop message_loop_;
   std::unique_ptr<ChildProcess> child_process_;
   std::unique_ptr<MockPeerConnectionDependencyFactory> dependency_factory_;
   std::unique_ptr<WebRtcMediaStreamAdapter> adapter_;
   MockAudioDeviceFactory mock_audio_device_factory_;
 };
 
 TEST_F(WebRtcMediaStreamAdapterTest, CreateWebRtcMediaStream) {
   blink::WebMediaStream blink_stream = CreateBlinkMediaStream(true, true);
   CreateWebRtcMediaStream(blink_stream, 1, 1);
@@ skipping 42 matching lines @@
   EXPECT_TRUE(webrtc_stream()->GetVideoTracks().empty());
 
   native_stream->AddTrack(audio_tracks[0]);
   EXPECT_EQ(1u, webrtc_stream()->GetAudioTracks().size());
 
   native_stream->AddTrack(video_tracks[0]);
   EXPECT_EQ(1u, webrtc_stream()->GetVideoTracks().size());
 }
 
 }  // namespace content