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

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

Issue 2425703002: Remove |remote| and |readonly| members of MediaStreamTrack (Closed)
Patch Set: Remove |remote| and |readonly| members of MediaStreamTrack Created 4 years, 2 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/media_stream_remote_video_source.h" 5 #include "content/renderer/media/webrtc/media_stream_remote_video_source.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 mock_factory_(new MockPeerConnectionDependencyFactory()), 43 mock_factory_(new MockPeerConnectionDependencyFactory()),
44 webrtc_video_track_(MockWebRtcVideoTrack::Create("test")), 44 webrtc_video_track_(MockWebRtcVideoTrack::Create("test")),
45 remote_source_(new MediaStreamRemoteVideoSourceUnderTest( 45 remote_source_(new MediaStreamRemoteVideoSourceUnderTest(
46 std::unique_ptr<TrackObserver>( 46 std::unique_ptr<TrackObserver>(
47 new TrackObserver(base::ThreadTaskRunnerHandle::Get(), 47 new TrackObserver(base::ThreadTaskRunnerHandle::Get(),
48 webrtc_video_track_.get())))), 48 webrtc_video_track_.get())))),
49 number_of_successful_constraints_applied_(0), 49 number_of_successful_constraints_applied_(0),
50 number_of_failed_constraints_applied_(0) { 50 number_of_failed_constraints_applied_(0) {
51 webkit_source_.initialize(base::UTF8ToUTF16("dummy_source_id"), 51 webkit_source_.initialize(base::UTF8ToUTF16("dummy_source_id"),
52 blink::WebMediaStreamSource::TypeVideo, 52 blink::WebMediaStreamSource::TypeVideo,
53 base::UTF8ToUTF16("dummy_source_name"), 53 base::UTF8ToUTF16("dummy_source_name"));
54 true /* remote */);
55 webkit_source_.setExtraData(remote_source_); 54 webkit_source_.setExtraData(remote_source_);
56 } 55 }
57 56
58 void TearDown() override { 57 void TearDown() override {
59 remote_source_->OnSourceTerminated(); 58 remote_source_->OnSourceTerminated();
60 webkit_source_.reset(); 59 webkit_source_.reset();
61 blink::WebHeap::collectAllGarbageForTesting(); 60 blink::WebHeap::collectAllGarbageForTesting();
62 } 61 }
63 62
64 MediaStreamRemoteVideoSourceUnderTest* source() { 63 MediaStreamRemoteVideoSourceUnderTest* source() {
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 StopWebRtcTrack(); 149 StopWebRtcTrack();
151 base::RunLoop().RunUntilIdle(); 150 base::RunLoop().RunUntilIdle();
152 EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded, 151 EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded,
153 webkit_source().getReadyState()); 152 webkit_source().getReadyState());
154 EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded, sink.state()); 153 EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded, sink.state());
155 154
156 track->RemoveSink(&sink); 155 track->RemoveSink(&sink);
157 } 156 }
158 157
159 } // namespace content 158 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698