Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Side by Side Diff: content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc

Issue 1915793002: Remove a |readonly| member of MediaStreamTrack (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove a |readonly| argument in unittest files Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "content/renderer/media/webrtc/webrtc_media_stream_adapter.h" 5 #include "content/renderer/media/webrtc/webrtc_media_stream_adapter.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory> 9 #include <memory>
10 10
(...skipping 29 matching lines...) Expand all
40 } 40 }
41 41
42 blink::WebMediaStream CreateBlinkMediaStream(bool audio, bool video) { 42 blink::WebMediaStream CreateBlinkMediaStream(bool audio, bool video) {
43 blink::WebVector<blink::WebMediaStreamTrack> audio_track_vector( 43 blink::WebVector<blink::WebMediaStreamTrack> audio_track_vector(
44 audio ? static_cast<size_t>(1) : 0); 44 audio ? static_cast<size_t>(1) : 0);
45 if (audio) { 45 if (audio) {
46 blink::WebMediaStreamSource audio_source; 46 blink::WebMediaStreamSource audio_source;
47 audio_source.initialize("audio", 47 audio_source.initialize("audio",
48 blink::WebMediaStreamSource::TypeAudio, 48 blink::WebMediaStreamSource::TypeAudio,
49 "audio", 49 "audio",
50 false /* remote */, true /* readonly */); 50 false /* remote */);
51 audio_source.setExtraData(new MediaStreamAudioSource()); 51 audio_source.setExtraData(new MediaStreamAudioSource());
52 52
53 audio_track_vector[0].initialize(audio_source); 53 audio_track_vector[0].initialize(audio_source);
54 scoped_refptr<WebRtcLocalAudioTrackAdapter> adapter( 54 scoped_refptr<WebRtcLocalAudioTrackAdapter> adapter(
55 WebRtcLocalAudioTrackAdapter::Create( 55 WebRtcLocalAudioTrackAdapter::Create(
56 audio_track_vector[0].id().utf8(), nullptr)); 56 audio_track_vector[0].id().utf8(), nullptr));
57 std::unique_ptr<WebRtcLocalAudioTrack> native_track( 57 std::unique_ptr<WebRtcLocalAudioTrack> native_track(
58 new WebRtcLocalAudioTrack(adapter.get())); 58 new WebRtcLocalAudioTrack(adapter.get()));
59 audio_track_vector[0].setExtraData(native_track.release()); 59 audio_track_vector[0].setExtraData(native_track.release());
60 } 60 }
61 61
62 blink::WebVector<blink::WebMediaStreamTrack> video_track_vector( 62 blink::WebVector<blink::WebMediaStreamTrack> video_track_vector(
63 video ? static_cast<size_t>(1) : 0); 63 video ? static_cast<size_t>(1) : 0);
64 MediaStreamSource::SourceStoppedCallback dummy_callback; 64 MediaStreamSource::SourceStoppedCallback dummy_callback;
65 if (video) { 65 if (video) {
66 blink::WebMediaStreamSource video_source; 66 blink::WebMediaStreamSource video_source;
67 video_source.initialize("video", 67 video_source.initialize("video",
68 blink::WebMediaStreamSource::TypeVideo, 68 blink::WebMediaStreamSource::TypeVideo,
69 "video", 69 "video",
70 false /* remote */, true /* readonly */); 70 false /* remote */);
71 MediaStreamVideoSource* native_source = 71 MediaStreamVideoSource* native_source =
72 new MockMediaStreamVideoSource(false); 72 new MockMediaStreamVideoSource(false);
73 video_source.setExtraData(native_source); 73 video_source.setExtraData(native_source);
74 blink::WebMediaConstraints constraints; 74 blink::WebMediaConstraints constraints;
75 constraints.initialize(); 75 constraints.initialize();
76 video_track_vector[0] = MediaStreamVideoTrack::CreateVideoTrack( 76 video_track_vector[0] = MediaStreamVideoTrack::CreateVideoTrack(
77 native_source, constraints, 77 native_source, constraints,
78 MediaStreamVideoSource::ConstraintsCallback(), true); 78 MediaStreamVideoSource::ConstraintsCallback(), true);
79 } 79 }
80 80
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 // Test that we don't crash if a MediaStream is created in Blink with an unknown 119 // Test that we don't crash if a MediaStream is created in Blink with an unknown
120 // audio sources. This can happen if a MediaStream is created with 120 // audio sources. This can happen if a MediaStream is created with
121 // remote audio track. 121 // remote audio track.
122 TEST_F(WebRtcMediaStreamAdapterTest, 122 TEST_F(WebRtcMediaStreamAdapterTest,
123 CreateWebRtcMediaStreamWithoutAudioSource) { 123 CreateWebRtcMediaStreamWithoutAudioSource) {
124 // Create a blink MediaStream description. 124 // Create a blink MediaStream description.
125 blink::WebMediaStreamSource audio_source; 125 blink::WebMediaStreamSource audio_source;
126 audio_source.initialize("audio source", 126 audio_source.initialize("audio source",
127 blink::WebMediaStreamSource::TypeAudio, 127 blink::WebMediaStreamSource::TypeAudio,
128 "something", 128 "something",
129 false /* remote */, true /* readonly */); 129 false /* remote */);
130 130
131 blink::WebVector<blink::WebMediaStreamTrack> audio_tracks( 131 blink::WebVector<blink::WebMediaStreamTrack> audio_tracks(
132 static_cast<size_t>(1)); 132 static_cast<size_t>(1));
133 audio_tracks[0].initialize(audio_source.id(), audio_source); 133 audio_tracks[0].initialize(audio_source.id(), audio_source);
134 blink::WebVector<blink::WebMediaStreamTrack> video_tracks( 134 blink::WebVector<blink::WebMediaStreamTrack> video_tracks(
135 static_cast<size_t>(0)); 135 static_cast<size_t>(0));
136 136
137 blink::WebMediaStream blink_stream; 137 blink::WebMediaStream blink_stream;
138 blink_stream.initialize("new stream", audio_tracks, video_tracks); 138 blink_stream.initialize("new stream", audio_tracks, video_tracks);
139 blink_stream.setExtraData(new content::MediaStream()); 139 blink_stream.setExtraData(new content::MediaStream());
(...skipping 19 matching lines...) Expand all
159 EXPECT_TRUE(webrtc_stream()->GetVideoTracks().empty()); 159 EXPECT_TRUE(webrtc_stream()->GetVideoTracks().empty());
160 160
161 native_stream->AddTrack(audio_tracks[0]); 161 native_stream->AddTrack(audio_tracks[0]);
162 EXPECT_EQ(1u, webrtc_stream()->GetAudioTracks().size()); 162 EXPECT_EQ(1u, webrtc_stream()->GetAudioTracks().size());
163 163
164 native_stream->AddTrack(video_tracks[0]); 164 native_stream->AddTrack(video_tracks[0]);
165 EXPECT_EQ(1u, webrtc_stream()->GetVideoTracks().size()); 165 EXPECT_EQ(1u, webrtc_stream()->GetVideoTracks().size());
166 } 166 }
167 167
168 } // namespace content 168 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698