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

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

Issue 276993002: Revert 269271 "Mac Video Capture Device: split VCD into VCD and ..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1984/src/
Patch Set: Created 6 years, 7 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 #include <queue> 6 #include <queue>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/callback_helpers.h" 9 #include "base/callback_helpers.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
12 #include "base/run_loop.h" 12 #include "base/run_loop.h"
13 #include "content/browser/browser_thread_impl.h" 13 #include "content/browser/browser_thread_impl.h"
14 #include "content/browser/renderer_host/media/media_stream_dispatcher_host.h" 14 #include "content/browser/renderer_host/media/media_stream_dispatcher_host.h"
15 #include "content/browser/renderer_host/media/media_stream_manager.h" 15 #include "content/browser/renderer_host/media/media_stream_manager.h"
16 #include "content/browser/renderer_host/media/media_stream_ui_proxy.h" 16 #include "content/browser/renderer_host/media/media_stream_ui_proxy.h"
17 #include "content/browser/renderer_host/media/video_capture_manager.h" 17 #include "content/browser/renderer_host/media/video_capture_manager.h"
18 #include "content/common/media/media_stream_messages.h" 18 #include "content/common/media/media_stream_messages.h"
19 #include "content/common/media/media_stream_options.h" 19 #include "content/common/media/media_stream_options.h"
20 #include "content/public/browser/media_device_id.h" 20 #include "content/public/browser/media_device_id.h"
21 #include "content/public/common/content_switches.h" 21 #include "content/public/common/content_switches.h"
22 #include "content/public/test/mock_resource_context.h" 22 #include "content/public/test/mock_resource_context.h"
23 #include "content/public/test/test_browser_context.h" 23 #include "content/public/test/test_browser_context.h"
24 #include "content/public/test/test_browser_thread_bundle.h" 24 #include "content/public/test/test_browser_thread_bundle.h"
25 #include "content/test/test_content_browser_client.h" 25 #include "content/test/test_content_browser_client.h"
26 #include "content/test/test_content_client.h" 26 #include "content/test/test_content_client.h"
27 #include "ipc/ipc_message_macros.h" 27 #include "ipc/ipc_message_macros.h"
28 #include "media/audio/mock_audio_manager.h" 28 #include "media/audio/mock_audio_manager.h"
29 #include "media/base/media_switches.h"
30 #include "media/video/capture/fake_video_capture_device_factory.h" 29 #include "media/video/capture/fake_video_capture_device_factory.h"
31 #include "net/url_request/url_request_context.h" 30 #include "net/url_request/url_request_context.h"
32 #include "testing/gmock/include/gmock/gmock.h" 31 #include "testing/gmock/include/gmock/gmock.h"
33 #include "testing/gtest/include/gtest/gtest.h" 32 #include "testing/gtest/include/gtest/gtest.h"
34 33
35 using ::testing::_; 34 using ::testing::_;
36 using ::testing::DeleteArg; 35 using ::testing::DeleteArg;
37 using ::testing::DoAll; 36 using ::testing::DoAll;
38 using ::testing::Return; 37 using ::testing::Return;
39 using ::testing::SaveArg; 38 using ::testing::SaveArg;
(...skipping 813 matching lines...) Expand 10 before | Expand all | Expand 10 after
853 EnumerateDevicesAndWaitForResult(kRenderId, kPageRequestId, 852 EnumerateDevicesAndWaitForResult(kRenderId, kPageRequestId,
854 MEDIA_DEVICE_AUDIO_CAPTURE); 853 MEDIA_DEVICE_AUDIO_CAPTURE);
855 } 854 }
856 855
857 TEST_F(MediaStreamDispatcherHostTest, EnumerateVideoDevices) { 856 TEST_F(MediaStreamDispatcherHostTest, EnumerateVideoDevices) {
858 EnumerateDevicesAndWaitForResult(kRenderId, kPageRequestId, 857 EnumerateDevicesAndWaitForResult(kRenderId, kPageRequestId,
859 MEDIA_DEVICE_VIDEO_CAPTURE); 858 MEDIA_DEVICE_VIDEO_CAPTURE);
860 } 859 }
861 860
862 }; // namespace content 861 }; // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698