| 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 "chrome/browser/media/webrtc_browsertest_base.h" | 6 #include "chrome/browser/media/webrtc_browsertest_base.h" |
| 7 #include "chrome/browser/media/webrtc_browsertest_common.h" | 7 #include "chrome/browser/media/webrtc_browsertest_common.h" |
| 8 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
| 9 #include "chrome/browser/ui/browser_tabstrip.h" | 9 #include "chrome/browser/ui/browser_tabstrip.h" |
| 10 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 10 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 // "Temporarily" disabled on QtKit due to http://crbug.com/375185. | 90 // "Temporarily" disabled on QtKit due to http://crbug.com/375185. |
| 91 EXPECT_EQ("320x240", | 91 EXPECT_EQ("320x240", |
| 92 GetUserMediaAndGetStreamSize(tab, | 92 GetUserMediaAndGetStreamSize(tab, |
| 93 kVideoCallConstraintsQVGA)); | 93 kVideoCallConstraintsQVGA)); |
| 94 } | 94 } |
| 95 | 95 |
| 96 EXPECT_EQ("640x480", | 96 EXPECT_EQ("640x480", |
| 97 GetUserMediaAndGetStreamSize(tab, kVideoCallConstraintsVGA)); | 97 GetUserMediaAndGetStreamSize(tab, kVideoCallConstraintsVGA)); |
| 98 EXPECT_EQ("640x360", | 98 EXPECT_EQ("640x360", |
| 99 GetUserMediaAndGetStreamSize(tab, kVideoCallConstraints360p)); | 99 GetUserMediaAndGetStreamSize(tab, kVideoCallConstraints360p)); |
| 100 EXPECT_EQ("1280x720", | |
| 101 GetUserMediaAndGetStreamSize(tab, kVideoCallConstraints720p)); | |
| 102 | 100 |
| 103 // QTKit only supports up to 720p. | 101 // QTKit supports up to 480p (used to support 720p until crbug.com/440762). |
| 104 if (IsOnQtKit()) | 102 if (IsOnQtKit()) |
| 105 return; | 103 return; |
| 106 | 104 |
| 105 EXPECT_EQ("1280x720", |
| 106 GetUserMediaAndGetStreamSize(tab, kVideoCallConstraints720p)); |
| 107 EXPECT_EQ("1920x1080", | 107 EXPECT_EQ("1920x1080", |
| 108 GetUserMediaAndGetStreamSize(tab, kVideoCallConstraints1080p)); | 108 GetUserMediaAndGetStreamSize(tab, kVideoCallConstraints1080p)); |
| 109 } | 109 } |
| 110 | 110 |
| 111 INSTANTIATE_TEST_CASE_P(WebRtcWebcamBrowserTests, | 111 INSTANTIATE_TEST_CASE_P(WebRtcWebcamBrowserTests, |
| 112 WebRtcWebcamBrowserTest, | 112 WebRtcWebcamBrowserTest, |
| 113 testing::ValuesIn(kTestConfigFlags)); | 113 testing::ValuesIn(kTestConfigFlags)); |
| OLD | NEW |