| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
| 8 #include "content/renderer/media/media_stream_extra_data.h" | 8 #include "content/renderer/media/media_stream_extra_data.h" |
| 9 #include "content/renderer/media/mock_media_stream_dependency_factory.h" | 9 #include "content/renderer/media/mock_media_stream_dependency_factory.h" |
| 10 #include "content/renderer/media/mock_media_stream_registry.h" | 10 #include "content/renderer/media/mock_media_stream_registry.h" |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 // Verify the video track has been added. | 108 // Verify the video track has been added. |
| 109 const WebKit::WebMediaStream test_stream = registry_.test_stream(); | 109 const WebKit::WebMediaStream test_stream = registry_.test_stream(); |
| 110 WebKit::WebVector<WebKit::WebMediaStreamTrack> video_tracks; | 110 WebKit::WebVector<WebKit::WebMediaStreamTrack> video_tracks; |
| 111 test_stream.videoSources(video_tracks); | 111 test_stream.videoSources(video_tracks); |
| 112 EXPECT_EQ(1u, video_tracks.size()); | 112 EXPECT_EQ(1u, video_tracks.size()); |
| 113 | 113 |
| 114 // Verify the native video track has been added. | 114 // Verify the native video track has been added. |
| 115 MediaStreamExtraData* extra_data = | 115 MediaStreamExtraData* extra_data = |
| 116 static_cast<MediaStreamExtraData*>(test_stream.extraData()); | 116 static_cast<MediaStreamExtraData*>(test_stream.extraData()); |
| 117 DCHECK(extra_data); | 117 DCHECK(extra_data); |
| 118 webrtc::MediaStreamInterface* native_stream = extra_data->stream(); | 118 webrtc::MediaStreamInterface* native_stream = extra_data->stream().get(); |
| 119 DCHECK(native_stream); | 119 DCHECK(native_stream); |
| 120 webrtc::VideoTrackVector native_video_tracks = | 120 webrtc::VideoTrackVector native_video_tracks = |
| 121 native_stream->GetVideoTracks(); | 121 native_stream->GetVideoTracks(); |
| 122 EXPECT_EQ(1u, native_video_tracks.size()); | 122 EXPECT_EQ(1u, native_video_tracks.size()); |
| 123 | 123 |
| 124 delete frame_writer; | 124 delete frame_writer; |
| 125 } | 125 } |
| 126 | 126 |
| 127 } // namespace content | 127 } // namespace content |
| OLD | NEW |