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 633303002: Replace FINAL and OVERRIDE with their C++11 counterparts in content/renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 "base/message_loop/message_loop.h" 5 #include "base/message_loop/message_loop.h"
6 #include "base/run_loop.h" 6 #include "base/run_loop.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "content/child/child_process.h" 8 #include "content/child/child_process.h"
9 #include "content/renderer/media/media_stream_video_track.h" 9 #include "content/renderer/media/media_stream_video_track.h"
10 #include "content/renderer/media/mock_media_stream_video_sink.h" 10 #include "content/renderer/media/mock_media_stream_video_sink.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 remote_source_(new MediaStreamRemoteVideoSourceUnderTest( 42 remote_source_(new MediaStreamRemoteVideoSourceUnderTest(
43 webrtc_video_track_.get())), 43 webrtc_video_track_.get())),
44 number_of_successful_constraints_applied_(0), 44 number_of_successful_constraints_applied_(0),
45 number_of_failed_constraints_applied_(0) { 45 number_of_failed_constraints_applied_(0) {
46 webkit_source_.initialize(base::UTF8ToUTF16("dummy_source_id"), 46 webkit_source_.initialize(base::UTF8ToUTF16("dummy_source_id"),
47 blink::WebMediaStreamSource::TypeVideo, 47 blink::WebMediaStreamSource::TypeVideo,
48 base::UTF8ToUTF16("dummy_source_name")); 48 base::UTF8ToUTF16("dummy_source_name"));
49 webkit_source_.setExtraData(remote_source_); 49 webkit_source_.setExtraData(remote_source_);
50 } 50 }
51 51
52 virtual void TearDown() OVERRIDE { 52 virtual void TearDown() override {
53 webkit_source_.reset(); 53 webkit_source_.reset();
54 blink::WebHeap::collectAllGarbageForTesting(); 54 blink::WebHeap::collectAllGarbageForTesting();
55 } 55 }
56 56
57 MediaStreamRemoteVideoSourceUnderTest* source() { 57 MediaStreamRemoteVideoSourceUnderTest* source() {
58 return remote_source_; 58 return remote_source_;
59 } 59 }
60 60
61 MediaStreamVideoTrack* CreateTrack() { 61 MediaStreamVideoTrack* CreateTrack() {
62 bool enabled = true; 62 bool enabled = true;
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 webkit_source().readyState()); 139 webkit_source().readyState());
140 StopWebRtcTrack(); 140 StopWebRtcTrack();
141 EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded, 141 EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded,
142 webkit_source().readyState()); 142 webkit_source().readyState());
143 EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded, sink.state()); 143 EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded, sink.state());
144 144
145 track->RemoveSink(&sink); 145 track->RemoveSink(&sink);
146 } 146 }
147 147
148 } // namespace content 148 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698