| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "build/build_config.h" | 6 #include "build/build_config.h" |
| 7 #include "chrome/browser/media/webrtc_browsertest_base.h" | 7 #include "chrome/browser/media/webrtc_browsertest_base.h" |
| 8 #include "chrome/browser/media/webrtc_browsertest_common.h" | 8 #include "chrome/browser/media/webrtc_browsertest_common.h" |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/browser/ui/browser_tabstrip.h" | 10 #include "chrome/browser/ui/browser_tabstrip.h" |
| 11 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 11 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 12 #include "chrome/common/chrome_switches.h" | 12 #include "chrome/common/chrome_switches.h" |
| 13 #include "chrome/test/base/in_process_browser_test.h" | 13 #include "chrome/test/base/in_process_browser_test.h" |
| 14 #include "chrome/test/base/ui_test_utils.h" | 14 #include "chrome/test/base/ui_test_utils.h" |
| 15 #include "content/public/common/content_switches.h" | 15 #include "content/public/common/content_switches.h" |
| 16 #include "content/public/test/browser_test_utils.h" | 16 #include "content/public/test/browser_test_utils.h" |
| 17 #include "media/base/media_switches.h" | 17 #include "media/base/media_switches.h" |
| 18 #include "net/test/embedded_test_server/embedded_test_server.h" | 18 #include "net/test/embedded_test_server/embedded_test_server.h" |
| 19 #include "testing/gtest/include/gtest/gtest-param-test.h" | 19 #include "testing/gtest/include/gtest/gtest-param-test.h" |
| 20 | 20 |
| 21 static const char kMainWebrtcTestHtmlPage[] = | 21 static const char kMainWebrtcTestHtmlPage[] = |
| 22 "/webrtc/webrtc_jsep01_test.html"; | 22 "/webrtc/webrtc_jsep01_test.html"; |
| 23 | 23 |
| 24 static const char* kTestConfigFlags[] = { | 24 static const char* kTestConfigFlags[] = { |
| 25 #if defined(OS_WIN) | 25 #if defined(OS_WIN) |
| 26 switches::kForceDirectShowVideoCapture, | 26 switches::kForceDirectShowVideoCapture, |
| 27 // Media Foundation is only available in Windows versions >= 7, below that the | 27 // Media Foundation is only available in Windows versions >= 7, below that the |
| 28 // following flag has no effect; the test would run twice using DirectShow. | 28 // following flag has no effect; the test would run twice using DirectShow. |
| 29 switches::kForceMediaFoundationVideoCapture | 29 switches::kForceMediaFoundationVideoCapture |
| 30 #elif defined(OS_MACOSX) | |
| 31 switches::kForceQTKit, | |
| 32 switches::kEnableAVFoundation | |
| 33 #else | 30 #else |
| 34 NULL | 31 NULL |
| 35 #endif | 32 #endif |
| 36 }; | 33 }; |
| 37 | 34 |
| 38 // These tests runs on real webcams and ensure WebRTC can acquire webcams | 35 // These tests runs on real webcams and ensure WebRTC can acquire webcams |
| 39 // correctly. They will do nothing if there are no webcams on the system. | 36 // correctly. They will do nothing if there are no webcams on the system. |
| 40 // The webcam on the system must support up to 1080p, or the test will fail. | 37 // The webcam on the system must support up to 1080p, or the test will fail. |
| 41 // This test is excellent for testing the various capture paths of WebRTC | 38 // This test is excellent for testing the various capture paths of WebRTC |
| 42 // on all desktop platforms. | 39 // on all desktop platforms. |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 | 109 |
| 113 EXPECT_EQ("1280x720", | 110 EXPECT_EQ("1280x720", |
| 114 GetUserMediaAndGetStreamSize(tab, kVideoCallConstraints720p)); | 111 GetUserMediaAndGetStreamSize(tab, kVideoCallConstraints720p)); |
| 115 EXPECT_EQ("1920x1080", | 112 EXPECT_EQ("1920x1080", |
| 116 GetUserMediaAndGetStreamSize(tab, kVideoCallConstraints1080p)); | 113 GetUserMediaAndGetStreamSize(tab, kVideoCallConstraints1080p)); |
| 117 } | 114 } |
| 118 | 115 |
| 119 INSTANTIATE_TEST_CASE_P(WebRtcWebcamBrowserTests, | 116 INSTANTIATE_TEST_CASE_P(WebRtcWebcamBrowserTests, |
| 120 WebRtcWebcamBrowserTest, | 117 WebRtcWebcamBrowserTest, |
| 121 testing::ValuesIn(kTestConfigFlags)); | 118 testing::ValuesIn(kTestConfigFlags)); |
| OLD | NEW |