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

Side by Side Diff: content/browser/renderer_host/media/video_capture_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 <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/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
11 #include "base/files/scoped_file.h" 11 #include "base/files/scoped_file.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
14 #include "base/run_loop.h" 14 #include "base/run_loop.h"
15 #include "base/stl_util.h" 15 #include "base/stl_util.h"
16 #include "base/strings/stringprintf.h" 16 #include "base/strings/stringprintf.h"
17 #include "content/browser/browser_thread_impl.h" 17 #include "content/browser/browser_thread_impl.h"
18 #include "content/browser/renderer_host/media/media_stream_manager.h" 18 #include "content/browser/renderer_host/media/media_stream_manager.h"
19 #include "content/browser/renderer_host/media/media_stream_requester.h" 19 #include "content/browser/renderer_host/media/media_stream_requester.h"
20 #include "content/browser/renderer_host/media/media_stream_ui_proxy.h" 20 #include "content/browser/renderer_host/media/media_stream_ui_proxy.h"
21 #include "content/browser/renderer_host/media/video_capture_host.h" 21 #include "content/browser/renderer_host/media/video_capture_host.h"
22 #include "content/browser/renderer_host/media/video_capture_manager.h" 22 #include "content/browser/renderer_host/media/video_capture_manager.h"
23 #include "content/common/media/video_capture_messages.h" 23 #include "content/common/media/video_capture_messages.h"
24 #include "content/public/common/content_switches.h" 24 #include "content/public/common/content_switches.h"
25 #include "content/public/test/mock_resource_context.h" 25 #include "content/public/test/mock_resource_context.h"
26 #include "content/public/test/test_browser_context.h" 26 #include "content/public/test/test_browser_context.h"
27 #include "content/public/test/test_browser_thread_bundle.h" 27 #include "content/public/test/test_browser_thread_bundle.h"
28 #include "content/test/test_content_browser_client.h" 28 #include "content/test/test_content_browser_client.h"
29 #include "media/audio/audio_manager.h" 29 #include "media/audio/audio_manager.h"
30 #include "media/base/media_switches.h"
31 #include "media/base/video_frame.h" 30 #include "media/base/video_frame.h"
32 #include "media/video/capture/video_capture_types.h" 31 #include "media/video/capture/video_capture_types.h"
33 #include "net/url_request/url_request_context.h" 32 #include "net/url_request/url_request_context.h"
34 #include "testing/gmock/include/gmock/gmock.h" 33 #include "testing/gmock/include/gmock/gmock.h"
35 #include "testing/gtest/include/gtest/gtest.h" 34 #include "testing/gtest/include/gtest/gtest.h"
36 35
37 using ::testing::_; 36 using ::testing::_;
38 using ::testing::AtLeast; 37 using ::testing::AtLeast;
39 using ::testing::AnyNumber; 38 using ::testing::AnyNumber;
40 using ::testing::DoAll; 39 using ::testing::DoAll;
(...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after
534 #ifdef DUMP_VIDEO 533 #ifdef DUMP_VIDEO
535 TEST_F(VideoCaptureHostTest, CaptureAndDumpVideoVga) { 534 TEST_F(VideoCaptureHostTest, CaptureAndDumpVideoVga) {
536 CaptureAndDumpVideo(640, 480, 30); 535 CaptureAndDumpVideo(640, 480, 30);
537 } 536 }
538 TEST_F(VideoCaptureHostTest, CaptureAndDump720P) { 537 TEST_F(VideoCaptureHostTest, CaptureAndDump720P) {
539 CaptureAndDumpVideo(1280, 720, 30); 538 CaptureAndDumpVideo(1280, 720, 30);
540 } 539 }
541 #endif 540 #endif
542 541
543 } // namespace content 542 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/media/media_stream_manager_unittest.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698