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

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

Issue 2902733003: RemoteMediaStreamImpl using WebRtcMediaStreamTrackMap. (Closed)
Patch Set: "Must be invoked on the main thread." Created 3 years, 6 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 19 matching lines...) Expand all
30 30
31 using ::testing::_; 31 using ::testing::_;
32 32
33 namespace content { 33 namespace content {
34 34
35 class WebRtcMediaStreamAdapterTest : public ::testing::Test { 35 class WebRtcMediaStreamAdapterTest : public ::testing::Test {
36 public: 36 public:
37 void SetUp() override { 37 void SetUp() override {
38 child_process_.reset(new ChildProcess()); 38 child_process_.reset(new ChildProcess());
39 dependency_factory_.reset(new MockPeerConnectionDependencyFactory()); 39 dependency_factory_.reset(new MockPeerConnectionDependencyFactory());
40 track_adapter_map_ = new WebRtcMediaStreamTrackAdapterMap( 40 track_adapter_map_ =
41 dependency_factory_.get(), base::ThreadTaskRunnerHandle::Get()); 41 new WebRtcMediaStreamTrackAdapterMap(dependency_factory_.get());
42 } 42 }
43 43
44 void TearDown() override { 44 void TearDown() override {
45 adapter_.reset(); 45 adapter_.reset();
46 track_adapter_map_ = nullptr; 46 track_adapter_map_ = nullptr;
47 blink::WebHeap::CollectAllGarbageForTesting(); 47 blink::WebHeap::CollectAllGarbageForTesting();
48 } 48 }
49 49
50 blink::WebMediaStream CreateBlinkMediaStream(bool audio, bool video) { 50 blink::WebMediaStream CreateBlinkMediaStream(bool audio, bool video) {
51 blink::WebVector<blink::WebMediaStreamTrack> audio_track_vector( 51 blink::WebVector<blink::WebMediaStreamTrack> audio_track_vector(
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 EXPECT_TRUE(webrtc_stream()->GetVideoTracks().empty()); 175 EXPECT_TRUE(webrtc_stream()->GetVideoTracks().empty());
176 176
177 native_stream->AddTrack(audio_tracks[0]); 177 native_stream->AddTrack(audio_tracks[0]);
178 EXPECT_EQ(1u, webrtc_stream()->GetAudioTracks().size()); 178 EXPECT_EQ(1u, webrtc_stream()->GetAudioTracks().size());
179 179
180 native_stream->AddTrack(video_tracks[0]); 180 native_stream->AddTrack(video_tracks[0]);
181 EXPECT_EQ(1u, webrtc_stream()->GetVideoTracks().size()); 181 EXPECT_EQ(1u, webrtc_stream()->GetVideoTracks().size());
182 } 182 }
183 183
184 } // namespace content 184 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698