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

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

Issue 1170623003: Revert "content: Remove use of MessageLoopProxy and deprecated MessageLoop APIs" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
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 // Unit test for VideoCaptureManager. 5 // Unit test for VideoCaptureManager.
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/message_loop/message_loop.h"
12 #include "base/run_loop.h" 13 #include "base/run_loop.h"
13 #include "content/browser/browser_thread_impl.h" 14 #include "content/browser/browser_thread_impl.h"
14 #include "content/browser/renderer_host/media/media_stream_provider.h" 15 #include "content/browser/renderer_host/media/media_stream_provider.h"
15 #include "content/browser/renderer_host/media/video_capture_controller_event_han dler.h" 16 #include "content/browser/renderer_host/media/video_capture_controller_event_han dler.h"
16 #include "content/browser/renderer_host/media/video_capture_manager.h" 17 #include "content/browser/renderer_host/media/video_capture_manager.h"
17 #include "content/common/media/media_stream_options.h" 18 #include "content/common/media/media_stream_options.h"
18 #include "media/video/capture/fake_video_capture_device_factory.h" 19 #include "media/video/capture/fake_video_capture_device_factory.h"
19 #include "testing/gmock/include/gmock/gmock.h" 20 #include "testing/gmock/include/gmock/gmock.h"
20 #include "testing/gtest/include/gtest/gtest.h" 21 #include "testing/gtest/include/gtest/gtest.h"
21 22
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 message_loop_.reset(new base::MessageLoopForIO); 81 message_loop_.reset(new base::MessageLoopForIO);
81 io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO, 82 io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO,
82 message_loop_.get())); 83 message_loop_.get()));
83 vcm_ = new VideoCaptureManager(scoped_ptr<media::VideoCaptureDeviceFactory>( 84 vcm_ = new VideoCaptureManager(scoped_ptr<media::VideoCaptureDeviceFactory>(
84 new media::FakeVideoCaptureDeviceFactory())); 85 new media::FakeVideoCaptureDeviceFactory()));
85 video_capture_device_factory_ = 86 video_capture_device_factory_ =
86 static_cast<media::FakeVideoCaptureDeviceFactory*>( 87 static_cast<media::FakeVideoCaptureDeviceFactory*>(
87 vcm_->video_capture_device_factory()); 88 vcm_->video_capture_device_factory());
88 const int32 kNumberOfFakeDevices = 2; 89 const int32 kNumberOfFakeDevices = 2;
89 video_capture_device_factory_->set_number_of_devices(kNumberOfFakeDevices); 90 video_capture_device_factory_->set_number_of_devices(kNumberOfFakeDevices);
90 vcm_->Register(listener_.get(), message_loop_->task_runner().get()); 91 vcm_->Register(listener_.get(), message_loop_->message_loop_proxy().get());
91 frame_observer_.reset(new MockFrameObserver()); 92 frame_observer_.reset(new MockFrameObserver());
92 } 93 }
93 94
94 void TearDown() override {} 95 void TearDown() override {}
95 96
96 void OnGotControllerCallback( 97 void OnGotControllerCallback(
97 VideoCaptureControllerID id, 98 VideoCaptureControllerID id,
98 base::Closure quit_closure, 99 base::Closure quit_closure,
99 bool expect_success, 100 bool expect_success,
100 const base::WeakPtr<VideoCaptureController>& controller) { 101 const base::WeakPtr<VideoCaptureController>& controller) {
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 513
513 // Wait to check callbacks before removing the listener 514 // Wait to check callbacks before removing the listener
514 message_loop_->RunUntilIdle(); 515 message_loop_->RunUntilIdle();
515 vcm_->Unregister(); 516 vcm_->Unregister();
516 } 517 }
517 518
518 // TODO(mcasas): Add a test to check consolidation of the supported formats 519 // TODO(mcasas): Add a test to check consolidation of the supported formats
519 // provided by the device when http://crbug.com/323913 is closed. 520 // provided by the device when http://crbug.com/323913 is closed.
520 521
521 } // namespace content 522 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/media/video_capture_manager.cc ('k') | content/browser/renderer_host/p2p/socket_host_tcp.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698