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

Side by Side Diff: content/renderer/media/user_media_client_impl_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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "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.h" 9 #include "content/renderer/media/media_stream.h"
10 #include "content/renderer/media/media_stream_track.h" 10 #include "content/renderer/media/media_stream_track.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 } 70 }
71 71
72 void RequestSources() { 72 void RequestSources() {
73 blink::WebMediaStreamTrackSourcesRequest sources_request; 73 blink::WebMediaStreamTrackSourcesRequest sources_request;
74 state_ = REQUEST_NOT_COMPLETE; 74 state_ = REQUEST_NOT_COMPLETE;
75 requestSources(sources_request); 75 requestSources(sources_request);
76 } 76 }
77 77
78 virtual void GetUserMediaRequestSucceeded( 78 virtual void GetUserMediaRequestSucceeded(
79 const blink::WebMediaStream& stream, 79 const blink::WebMediaStream& stream,
80 blink::WebUserMediaRequest* request_info) OVERRIDE { 80 blink::WebUserMediaRequest* request_info) override {
81 last_generated_stream_ = stream; 81 last_generated_stream_ = stream;
82 state_ = REQUEST_SUCCEEDED; 82 state_ = REQUEST_SUCCEEDED;
83 } 83 }
84 84
85 virtual void GetUserMediaRequestFailed( 85 virtual void GetUserMediaRequestFailed(
86 blink::WebUserMediaRequest* request_info, 86 blink::WebUserMediaRequest* request_info,
87 content::MediaStreamRequestResult result) OVERRIDE { 87 content::MediaStreamRequestResult result) override {
88 last_generated_stream_.reset(); 88 last_generated_stream_.reset();
89 state_ = REQUEST_FAILED; 89 state_ = REQUEST_FAILED;
90 result_ = result; 90 result_ = result;
91 } 91 }
92 92
93 virtual void GetUserMediaRequestTrackStartedFailed( 93 virtual void GetUserMediaRequestTrackStartedFailed(
94 blink::WebUserMediaRequest* request_info, 94 blink::WebUserMediaRequest* request_info,
95 MediaStreamRequestResult result, 95 MediaStreamRequestResult result,
96 const blink::WebString& result_name) OVERRIDE { 96 const blink::WebString& result_name) override {
97 last_generated_stream_.reset(); 97 last_generated_stream_.reset();
98 state_ = REQUEST_FAILED; 98 state_ = REQUEST_FAILED;
99 result_ = result; 99 result_ = result;
100 result_name_ = result_name; 100 result_name_ = result_name;
101 } 101 }
102 102
103 virtual void EnumerateDevicesSucceded( 103 virtual void EnumerateDevicesSucceded(
104 blink::WebMediaDevicesRequest* request, 104 blink::WebMediaDevicesRequest* request,
105 blink::WebVector<blink::WebMediaDeviceInfo>& devices) OVERRIDE { 105 blink::WebVector<blink::WebMediaDeviceInfo>& devices) override {
106 state_ = REQUEST_SUCCEEDED; 106 state_ = REQUEST_SUCCEEDED;
107 last_devices_ = devices; 107 last_devices_ = devices;
108 } 108 }
109 109
110 virtual void EnumerateSourcesSucceded( 110 virtual void EnumerateSourcesSucceded(
111 blink::WebMediaStreamTrackSourcesRequest* request, 111 blink::WebMediaStreamTrackSourcesRequest* request,
112 blink::WebVector<blink::WebSourceInfo>& sources) OVERRIDE { 112 blink::WebVector<blink::WebSourceInfo>& sources) override {
113 state_ = REQUEST_SUCCEEDED; 113 state_ = REQUEST_SUCCEEDED;
114 last_sources_ = sources; 114 last_sources_ = sources;
115 } 115 }
116 116
117 virtual MediaStreamVideoSource* CreateVideoSource( 117 virtual MediaStreamVideoSource* CreateVideoSource(
118 const StreamDeviceInfo& device, 118 const StreamDeviceInfo& device,
119 const MediaStreamSource::SourceStoppedCallback& stop_callback) OVERRIDE { 119 const MediaStreamSource::SourceStoppedCallback& stop_callback) override {
120 video_source_ = new MockMediaStreamVideoCapturerSource(device, 120 video_source_ = new MockMediaStreamVideoCapturerSource(device,
121 stop_callback, 121 stop_callback,
122 factory_); 122 factory_);
123 return video_source_; 123 return video_source_;
124 } 124 }
125 125
126 const blink::WebMediaStream& last_generated_stream() { 126 const blink::WebMediaStream& last_generated_stream() {
127 return last_generated_stream_; 127 return last_generated_stream_;
128 } 128 }
129 129
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 virtual void SetUp() { 163 virtual void SetUp() {
164 // Create our test object. 164 // Create our test object.
165 child_process_.reset(new ChildProcess()); 165 child_process_.reset(new ChildProcess());
166 dependency_factory_.reset(new MockPeerConnectionDependencyFactory()); 166 dependency_factory_.reset(new MockPeerConnectionDependencyFactory());
167 ms_dispatcher_ = new MockMediaStreamDispatcher(); 167 ms_dispatcher_ = new MockMediaStreamDispatcher();
168 used_media_impl_.reset(new UserMediaClientImplUnderTest( 168 used_media_impl_.reset(new UserMediaClientImplUnderTest(
169 dependency_factory_.get(), 169 dependency_factory_.get(),
170 scoped_ptr<MediaStreamDispatcher>(ms_dispatcher_).Pass())); 170 scoped_ptr<MediaStreamDispatcher>(ms_dispatcher_).Pass()));
171 } 171 }
172 172
173 virtual void TearDown() OVERRIDE { 173 virtual void TearDown() override {
174 used_media_impl_.reset(); 174 used_media_impl_.reset();
175 blink::WebHeap::collectAllGarbageForTesting(); 175 blink::WebHeap::collectAllGarbageForTesting();
176 } 176 }
177 177
178 blink::WebMediaStream RequestLocalMediaStream() { 178 blink::WebMediaStream RequestLocalMediaStream() {
179 used_media_impl_->RequestUserMedia(); 179 used_media_impl_->RequestUserMedia();
180 FakeMediaStreamDispatcherRequestUserMediaComplete(); 180 FakeMediaStreamDispatcherRequestUserMediaComplete();
181 StartMockedVideoSource(); 181 StartMockedVideoSource();
182 182
183 EXPECT_EQ(UserMediaClientImplUnderTest::REQUEST_SUCCEEDED, 183 EXPECT_EQ(UserMediaClientImplUnderTest::REQUEST_SUCCEEDED,
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 571
572 // Video input device environment facing. 572 // Video input device environment facing.
573 source = &used_media_impl_->last_sources()[3]; 573 source = &used_media_impl_->last_sources()[3];
574 EXPECT_FALSE(source->id().isEmpty()); 574 EXPECT_FALSE(source->id().isEmpty());
575 EXPECT_EQ(blink::WebSourceInfo::SourceKindVideo, source->kind()); 575 EXPECT_EQ(blink::WebSourceInfo::SourceKindVideo, source->kind());
576 EXPECT_FALSE(source->label().isEmpty()); 576 EXPECT_FALSE(source->label().isEmpty());
577 EXPECT_EQ(blink::WebSourceInfo::VideoFacingModeEnvironment, source->facing()); 577 EXPECT_EQ(blink::WebSourceInfo::VideoFacingModeEnvironment, source->facing());
578 } 578 }
579 579
580 } // namespace content 580 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/user_media_client_impl.h ('k') | content/renderer/media/video_capture_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698