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

Side by Side Diff: content/renderer/media/webrtc/webrtc_media_stream_adapter_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/memory/scoped_ptr.h" 5 #include "base/memory/scoped_ptr.h"
6 #include "base/message_loop/message_loop.h" 6 #include "base/message_loop/message_loop.h"
7 #include "content/child/child_process.h" 7 #include "content/child/child_process.h"
8 #include "content/renderer/media/media_stream.h" 8 #include "content/renderer/media/media_stream.h"
9 #include "content/renderer/media/media_stream_audio_source.h" 9 #include "content/renderer/media/media_stream_audio_source.h"
10 #include "content/renderer/media/media_stream_video_source.h" 10 #include "content/renderer/media/media_stream_video_source.h"
(...skipping 11 matching lines...) Expand all
22 22
23 namespace content { 23 namespace content {
24 24
25 class WebRtcMediaStreamAdapterTest : public ::testing::Test { 25 class WebRtcMediaStreamAdapterTest : public ::testing::Test {
26 public: 26 public:
27 virtual void SetUp() { 27 virtual void SetUp() {
28 child_process_.reset(new ChildProcess()); 28 child_process_.reset(new ChildProcess());
29 dependency_factory_.reset(new MockPeerConnectionDependencyFactory()); 29 dependency_factory_.reset(new MockPeerConnectionDependencyFactory());
30 } 30 }
31 31
32 virtual void TearDown() OVERRIDE { 32 virtual void TearDown() override {
33 adapter_.reset(); 33 adapter_.reset();
34 blink::WebHeap::collectAllGarbageForTesting(); 34 blink::WebHeap::collectAllGarbageForTesting();
35 } 35 }
36 36
37 blink::WebMediaStream CreateBlinkMediaStream(bool audio, bool video) { 37 blink::WebMediaStream CreateBlinkMediaStream(bool audio, bool video) {
38 blink::WebVector<blink::WebMediaStreamTrack> audio_track_vector( 38 blink::WebVector<blink::WebMediaStreamTrack> audio_track_vector(
39 audio ? static_cast<size_t>(1) : 0); 39 audio ? static_cast<size_t>(1) : 0);
40 if (audio) { 40 if (audio) {
41 blink::WebMediaStreamSource audio_source; 41 blink::WebMediaStreamSource audio_source;
42 audio_source.initialize("audio", 42 audio_source.initialize("audio",
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 EXPECT_TRUE(webrtc_stream()->GetVideoTracks().empty()); 152 EXPECT_TRUE(webrtc_stream()->GetVideoTracks().empty());
153 153
154 native_stream->AddTrack(audio_tracks[0]); 154 native_stream->AddTrack(audio_tracks[0]);
155 EXPECT_EQ(1u, webrtc_stream()->GetAudioTracks().size()); 155 EXPECT_EQ(1u, webrtc_stream()->GetAudioTracks().size());
156 156
157 native_stream->AddTrack(video_tracks[0]); 157 native_stream->AddTrack(video_tracks[0]);
158 EXPECT_EQ(1u, webrtc_stream()->GetVideoTracks().size()); 158 EXPECT_EQ(1u, webrtc_stream()->GetVideoTracks().size());
159 } 159 }
160 160
161 } // namespace content 161 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698