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

Side by Side Diff: content/renderer/media/media_stream_dispatcher_unittest.cc

Issue 323313003: Add flag in device enumeration request to control label clearing and don't clear for pepper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
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 <string> 5 #include <string>
6 6
7 #include "base/memory/ref_counted.h" 7 #include "base/memory/ref_counted.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 scoped_ptr<MockMediaStreamDispatcherEventHandler> 219 scoped_ptr<MockMediaStreamDispatcherEventHandler>
220 handler1(new MockMediaStreamDispatcherEventHandler); 220 handler1(new MockMediaStreamDispatcherEventHandler);
221 scoped_ptr<MockMediaStreamDispatcherEventHandler> 221 scoped_ptr<MockMediaStreamDispatcherEventHandler>
222 handler2(new MockMediaStreamDispatcherEventHandler); 222 handler2(new MockMediaStreamDispatcherEventHandler);
223 GURL security_origin; 223 GURL security_origin;
224 224
225 int ipc_request_id1 = dispatcher->next_ipc_id_; 225 int ipc_request_id1 = dispatcher->next_ipc_id_;
226 dispatcher->EnumerateDevices( 226 dispatcher->EnumerateDevices(
227 kRequestId1, handler1.get()->AsWeakPtr(), 227 kRequestId1, handler1.get()->AsWeakPtr(),
228 kVideoType, 228 kVideoType,
229 security_origin); 229 security_origin,
230 false);
230 int ipc_request_id2 = dispatcher->next_ipc_id_; 231 int ipc_request_id2 = dispatcher->next_ipc_id_;
231 EXPECT_NE(ipc_request_id1, ipc_request_id2); 232 EXPECT_NE(ipc_request_id1, ipc_request_id2);
232 dispatcher->EnumerateDevices( 233 dispatcher->EnumerateDevices(
233 kRequestId2, handler2.get()->AsWeakPtr(), 234 kRequestId2, handler2.get()->AsWeakPtr(),
234 kVideoType, 235 kVideoType,
235 security_origin); 236 security_origin,
237 false);
236 EXPECT_EQ(dispatcher->requests_.size(), size_t(2)); 238 EXPECT_EQ(dispatcher->requests_.size(), size_t(2));
237 239
238 StreamDeviceInfoArray video_device_array(1); 240 StreamDeviceInfoArray video_device_array(1);
239 StreamDeviceInfo video_device_info; 241 StreamDeviceInfo video_device_info;
240 video_device_info.device.name = "Camera"; 242 video_device_info.device.name = "Camera";
241 video_device_info.device.id = "device_path"; 243 video_device_info.device.id = "device_path";
242 video_device_info.device.type = kVideoType; 244 video_device_info.device.type = kVideoType;
243 video_device_info.session_id = kVideoSessionId; 245 video_device_info.session_id = kVideoSessionId;
244 video_device_array[0] = video_device_info; 246 video_device_array[0] = video_device_info;
245 247
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 dispatcher_->OnMessageReceived( 404 dispatcher_->OnMessageReceived(
403 MediaStreamMsg_DeviceStopped(kRouteId, label, handler_->video_device_)); 405 MediaStreamMsg_DeviceStopped(kRouteId, label, handler_->video_device_));
404 // Verify that MediaStreamDispatcherEventHandler::OnDeviceStopped has been 406 // Verify that MediaStreamDispatcherEventHandler::OnDeviceStopped has been
405 // called. 407 // called.
406 EXPECT_EQ(label, handler_->device_stopped_label_); 408 EXPECT_EQ(label, handler_->device_stopped_label_);
407 EXPECT_EQ(dispatcher_->video_session_id(label, 0), 409 EXPECT_EQ(dispatcher_->video_session_id(label, 0),
408 StreamDeviceInfo::kNoId); 410 StreamDeviceInfo::kNoId);
409 } 411 }
410 412
411 } // namespace content 413 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698