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

Side by Side Diff: content/browser/renderer_host/media/media_stream_ui_proxy_unittest.cc

Issue 655133002: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/browser/renderer_host/media/media_stream_ui_proxy.h" 5 #include "content/browser/renderer_host/media/media_stream_ui_proxy.h"
6 6
7 #include "base/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.h"
8 #include "content/browser/frame_host/render_frame_host_delegate.h" 8 #include "content/browser/frame_host/render_frame_host_delegate.h"
9 #include "content/public/common/renderer_preferences.h" 9 #include "content/public/common/renderer_preferences.h"
10 #include "content/public/test/test_browser_thread.h" 10 #include "content/public/test/test_browser_thread.h"
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 EXPECT_CALL(delegate_, RequestMediaAccessPermission(SameRequest(request), _)) 126 EXPECT_CALL(delegate_, RequestMediaAccessPermission(SameRequest(request), _))
127 .WillOnce(SaveArg<1>(&callback)); 127 .WillOnce(SaveArg<1>(&callback));
128 message_loop_.RunUntilIdle(); 128 message_loop_.RunUntilIdle();
129 ASSERT_FALSE(callback.is_null()); 129 ASSERT_FALSE(callback.is_null());
130 130
131 MediaStreamDevices devices; 131 MediaStreamDevices devices;
132 devices.push_back( 132 devices.push_back(
133 MediaStreamDevice(MEDIA_DEVICE_AUDIO_CAPTURE, "Mic", "Mic")); 133 MediaStreamDevice(MEDIA_DEVICE_AUDIO_CAPTURE, "Mic", "Mic"));
134 scoped_ptr<MockMediaStreamUI> ui(new MockMediaStreamUI()); 134 scoped_ptr<MockMediaStreamUI> ui(new MockMediaStreamUI());
135 EXPECT_CALL(*ui, OnStarted(_)).WillOnce(Return(0)); 135 EXPECT_CALL(*ui, OnStarted(_)).WillOnce(Return(0));
136 callback.Run(devices, MEDIA_DEVICE_OK, ui.PassAs<MediaStreamUI>()); 136 callback.Run(devices, MEDIA_DEVICE_OK, ui.Pass());
137 137
138 MediaStreamDevices response; 138 MediaStreamDevices response;
139 EXPECT_CALL(response_callback_, OnAccessRequestResponse(_, _)) 139 EXPECT_CALL(response_callback_, OnAccessRequestResponse(_, _))
140 .WillOnce(SaveArg<0>(&response)); 140 .WillOnce(SaveArg<0>(&response));
141 message_loop_.RunUntilIdle(); 141 message_loop_.RunUntilIdle();
142 142
143 EXPECT_FALSE(response.empty()); 143 EXPECT_FALSE(response.empty());
144 144
145 proxy_->OnStarted(base::Closure(), MediaStreamUIProxy::WindowIdCallback()); 145 proxy_->OnStarted(base::Closure(), MediaStreamUIProxy::WindowIdCallback());
146 message_loop_.RunUntilIdle(); 146 message_loop_.RunUntilIdle();
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 ASSERT_FALSE(callback.is_null()); 185 ASSERT_FALSE(callback.is_null());
186 186
187 base::Closure stop_callback; 187 base::Closure stop_callback;
188 188
189 MediaStreamDevices devices; 189 MediaStreamDevices devices;
190 devices.push_back( 190 devices.push_back(
191 MediaStreamDevice(MEDIA_DEVICE_AUDIO_CAPTURE, "Mic", "Mic")); 191 MediaStreamDevice(MEDIA_DEVICE_AUDIO_CAPTURE, "Mic", "Mic"));
192 scoped_ptr<MockMediaStreamUI> ui(new MockMediaStreamUI()); 192 scoped_ptr<MockMediaStreamUI> ui(new MockMediaStreamUI());
193 EXPECT_CALL(*ui, OnStarted(_)) 193 EXPECT_CALL(*ui, OnStarted(_))
194 .WillOnce(testing::DoAll(SaveArg<0>(&stop_callback), Return(0))); 194 .WillOnce(testing::DoAll(SaveArg<0>(&stop_callback), Return(0)));
195 callback.Run(devices, MEDIA_DEVICE_OK, ui.PassAs<MediaStreamUI>()); 195 callback.Run(devices, MEDIA_DEVICE_OK, ui.Pass());
196 196
197 MediaStreamDevices response; 197 MediaStreamDevices response;
198 EXPECT_CALL(response_callback_, OnAccessRequestResponse(_, _)) 198 EXPECT_CALL(response_callback_, OnAccessRequestResponse(_, _))
199 .WillOnce(SaveArg<0>(&response)); 199 .WillOnce(SaveArg<0>(&response));
200 message_loop_.RunUntilIdle(); 200 message_loop_.RunUntilIdle();
201 201
202 EXPECT_FALSE(response.empty()); 202 EXPECT_FALSE(response.empty());
203 203
204 MockStopStreamHandler stop_handler; 204 MockStopStreamHandler stop_handler;
205 proxy_->OnStarted(base::Bind(&MockStopStreamHandler::OnStop, 205 proxy_->OnStarted(base::Bind(&MockStopStreamHandler::OnStop,
(...skipping 24 matching lines...) Expand all
230 base::Unretained(&response_callback_))); 230 base::Unretained(&response_callback_)));
231 MediaResponseCallback callback; 231 MediaResponseCallback callback;
232 EXPECT_CALL(delegate_, RequestMediaAccessPermission(SameRequest(request), _)) 232 EXPECT_CALL(delegate_, RequestMediaAccessPermission(SameRequest(request), _))
233 .WillOnce(SaveArg<1>(&callback)); 233 .WillOnce(SaveArg<1>(&callback));
234 message_loop_.RunUntilIdle(); 234 message_loop_.RunUntilIdle();
235 235
236 const int kWindowId = 1; 236 const int kWindowId = 1;
237 scoped_ptr<MockMediaStreamUI> ui(new MockMediaStreamUI()); 237 scoped_ptr<MockMediaStreamUI> ui(new MockMediaStreamUI());
238 EXPECT_CALL(*ui, OnStarted(_)).WillOnce(Return(kWindowId)); 238 EXPECT_CALL(*ui, OnStarted(_)).WillOnce(Return(kWindowId));
239 239
240 callback.Run( 240 callback.Run(MediaStreamDevices(), MEDIA_DEVICE_OK, ui.Pass());
241 MediaStreamDevices(), MEDIA_DEVICE_OK, ui.PassAs<MediaStreamUI>());
242 EXPECT_CALL(response_callback_, OnAccessRequestResponse(_, _)); 241 EXPECT_CALL(response_callback_, OnAccessRequestResponse(_, _));
243 242
244 MockStopStreamHandler handler; 243 MockStopStreamHandler handler;
245 EXPECT_CALL(handler, OnWindowId(kWindowId)); 244 EXPECT_CALL(handler, OnWindowId(kWindowId));
246 245
247 proxy_->OnStarted( 246 proxy_->OnStarted(
248 base::Bind(&MockStopStreamHandler::OnStop, base::Unretained(&handler)), 247 base::Bind(&MockStopStreamHandler::OnStop, base::Unretained(&handler)),
249 base::Bind(&MockStopStreamHandler::OnWindowId, 248 base::Bind(&MockStopStreamHandler::OnWindowId,
250 base::Unretained(&handler))); 249 base::Unretained(&handler)));
251 message_loop_.RunUntilIdle(); 250 message_loop_.RunUntilIdle();
252 } 251 }
253 252
254 TEST_F(MediaStreamUIProxyTest, CheckAccess) { 253 TEST_F(MediaStreamUIProxyTest, CheckAccess) {
255 proxy_->CheckAccess(GURL("http://origin/"), 254 proxy_->CheckAccess(GURL("http://origin/"),
256 MEDIA_DEVICE_AUDIO_CAPTURE, 255 MEDIA_DEVICE_AUDIO_CAPTURE,
257 0, 256 0,
258 0, 257 0,
259 base::Bind(&MockResponseCallback::OnCheckResponse, 258 base::Bind(&MockResponseCallback::OnCheckResponse,
260 base::Unretained(&response_callback_))); 259 base::Unretained(&response_callback_)));
261 EXPECT_CALL(delegate_, CheckMediaAccessPermission(_, _)); 260 EXPECT_CALL(delegate_, CheckMediaAccessPermission(_, _));
262 EXPECT_CALL(response_callback_, OnCheckResponse(_)); 261 EXPECT_CALL(response_callback_, OnCheckResponse(_));
263 message_loop_.RunUntilIdle(); 262 message_loop_.RunUntilIdle();
264 } 263 }
265 264
266 } // content 265 } // content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698