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

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

Issue 34393006: Refactor MediaStreamManager to never output real device id. It now always output sourceId in the fo… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Clean up unneccessary test setup that just caused confusion. Created 7 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 | 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 <map> 5 #include <map>
6 #include <string> 6 #include <string>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 EXPECT_EQ(0u, host_->entries_.size()); 248 EXPECT_EQ(0u, host_->entries_.size());
249 249
250 CloseSession(); 250 CloseSession();
251 251
252 // Simulate closing the IPC channel. 252 // Simulate closing the IPC channel.
253 host_->OnChannelClosing(); 253 host_->OnChannelClosing();
254 254
255 // Release the reference to the mock object. The object will be destructed 255 // Release the reference to the mock object. The object will be destructed
256 // on the current message loop. 256 // on the current message loop.
257 host_ = NULL; 257 host_ = NULL;
258
259 media_stream_manager_->WillDestroyCurrentMessageLoop();
260 } 258 }
261 259
262 void OpenSession() { 260 void OpenSession() {
263 const int render_process_id = 1; 261 const int render_process_id = 1;
264 const int render_view_id = 1; 262 const int render_view_id = 1;
265 const int page_request_id = 1; 263 const int page_request_id = 1;
266 const GURL security_origin; 264 const GURL security_origin;
267 265
268 ASSERT_TRUE(opened_device_label_.empty()); 266 ASSERT_TRUE(opened_device_label_.empty());
269 267
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 #ifdef DUMP_VIDEO 482 #ifdef DUMP_VIDEO
485 TEST_F(VideoCaptureHostTest, CaptureAndDumpVideoVga) { 483 TEST_F(VideoCaptureHostTest, CaptureAndDumpVideoVga) {
486 CaptureAndDumpVideo(640, 480, 30); 484 CaptureAndDumpVideo(640, 480, 30);
487 } 485 }
488 TEST_F(VideoCaptureHostTest, CaptureAndDump720P) { 486 TEST_F(VideoCaptureHostTest, CaptureAndDump720P) {
489 CaptureAndDumpVideo(1280, 720, 30); 487 CaptureAndDumpVideo(1280, 720, 30);
490 } 488 }
491 #endif 489 #endif
492 490
493 } // namespace content 491 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698