Revert 262050 "Implement a source for remote video tracks."

trunk/src/content/renderer/media/media_stream_dependency_factory.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/media_stream_dependency_factory.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 660 matching lines @@
   // view, for example, by an extension.
   DCHECK_GE(render_view_id, 0);
 
   EnsureWebRtcAudioDeviceImpl();
   DCHECK(GetWebRtcAudioDevice());
   return WebRtcAudioCapturer::CreateCapturer(render_view_id, device_info,
                                              constraints,
                                              GetWebRtcAudioDevice());
 }
 
-void MediaStreamDependencyFactory::AddNativeAudioTrackToBlinkTrack(
+void MediaStreamDependencyFactory::AddNativeTrackToBlinkTrack(
     webrtc::MediaStreamTrackInterface* native_track,
     const blink::WebMediaStreamTrack& webkit_track,
     bool is_local_track) {
   DCHECK(!webkit_track.isNull() && !webkit_track.extraData());
-  DCHECK_EQ(blink::WebMediaStreamSource::TypeAudio,
-            webkit_track.source().type());
   blink::WebMediaStreamTrack track = webkit_track;
 
-  DVLOG(1) << "AddNativeTrackToBlinkTrack() audio";
-  track.setExtraData(
-      new MediaStreamTrack(
-          static_cast<webrtc::AudioTrackInterface*>(native_track),
-          is_local_track));
+  if (track.source().type() == blink::WebMediaStreamSource::TypeVideo) {
+    DVLOG(1) << "AddNativeTrackToBlinkTrack() video";
+    track.setExtraData(new WebRtcMediaStreamVideoTrack(
+        static_cast<webrtc::VideoTrackInterface*>(native_track)));
+  } else {
+    DVLOG(1) << "AddNativeTrackToBlinkTrack() audio";
+    track.setExtraData(
+        new MediaStreamTrack(
+            static_cast<webrtc::AudioTrackInterface*>(native_track),
+            is_local_track));
+  }
 }
 
 bool MediaStreamDependencyFactory::OnControlMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(MediaStreamDependencyFactory, message)
     IPC_MESSAGE_HANDLER(MediaStreamMsg_EnableAecDump, OnAecDumpFile)
     IPC_MESSAGE_HANDLER(MediaStreamMsg_DisableAecDump, OnDisableAecDump)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
@@ skipping 45 matching lines @@
 }
 
 void MediaStreamDependencyFactory::EnsureWebRtcAudioDeviceImpl() {
   if (audio_device_)
     return;
 
   audio_device_ = new WebRtcAudioDeviceImpl();
 }
 
 }  // namespace content