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

Side by Side Diff: content/renderer/media/media_stream_video_capture_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/bind.h" 5 #include "base/bind.h"
6 #include "base/callback_helpers.h" 6 #include "base/callback_helpers.h"
7 #include "base/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "content/child/child_process.h" 10 #include "content/child/child_process.h"
(...skipping 24 matching lines...) Expand all
35 }; 35 };
36 36
37 class MediaStreamVideoCapturerSourceTest : public testing::Test { 37 class MediaStreamVideoCapturerSourceTest : public testing::Test {
38 public: 38 public:
39 MediaStreamVideoCapturerSourceTest() 39 MediaStreamVideoCapturerSourceTest()
40 : child_process_(new ChildProcess()), 40 : child_process_(new ChildProcess()),
41 source_(NULL), 41 source_(NULL),
42 source_stopped_(false) { 42 source_stopped_(false) {
43 } 43 }
44 44
45 virtual void TearDown() OVERRIDE { 45 virtual void TearDown() override {
46 webkit_source_.reset(); 46 webkit_source_.reset();
47 blink::WebHeap::collectAllGarbageForTesting(); 47 blink::WebHeap::collectAllGarbageForTesting();
48 } 48 }
49 49
50 void InitWithDeviceInfo(const StreamDeviceInfo& device_info) { 50 void InitWithDeviceInfo(const StreamDeviceInfo& device_info) {
51 delegate_ = new MockVideoCapturerDelegate(device_info); 51 delegate_ = new MockVideoCapturerDelegate(device_info);
52 source_ = new MediaStreamVideoCapturerSource( 52 source_ = new MediaStreamVideoCapturerSource(
53 device_info, 53 device_info,
54 base::Bind(&MediaStreamVideoCapturerSourceTest::OnSourceStopped, 54 base::Bind(&MediaStreamVideoCapturerSourceTest::OnSourceStopped,
55 base::Unretained(this)), 55 base::Unretained(this)),
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 base::Bind(deliver_frame_cb, 216 base::Bind(deliver_frame_cb,
217 media::VideoFrame::CreateBlackFrame(gfx::Size(2, 2)), 217 media::VideoFrame::CreateBlackFrame(gfx::Size(2, 2)),
218 media::VideoCaptureFormat(), 218 media::VideoCaptureFormat(),
219 reference_capture_time)); 219 reference_capture_time));
220 run_loop.Run(); 220 run_loop.Run();
221 FakeMediaStreamVideoSink::RemoveFromVideoTrack(&fake_sink, track); 221 FakeMediaStreamVideoSink::RemoveFromVideoTrack(&fake_sink, track);
222 EXPECT_EQ(reference_capture_time, capture_time); 222 EXPECT_EQ(reference_capture_time, capture_time);
223 } 223 }
224 224
225 } // namespace content 225 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698