| 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 "chrome/browser/media/webrtc_browsertest_base.h" | 7 #include "chrome/browser/media/webrtc_browsertest_base.h" |
| 7 #include "chrome/browser/media/webrtc_browsertest_common.h" | 8 #include "chrome/browser/media/webrtc_browsertest_common.h" |
| 8 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 9 #include "chrome/browser/ui/browser_tabstrip.h" | 10 #include "chrome/browser/ui/browser_tabstrip.h" |
| 10 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 11 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 11 #include "chrome/common/chrome_switches.h" | 12 #include "chrome/common/chrome_switches.h" |
| 12 #include "chrome/test/base/in_process_browser_test.h" | 13 #include "chrome/test/base/in_process_browser_test.h" |
| 13 #include "chrome/test/base/ui_test_utils.h" | 14 #include "chrome/test/base/ui_test_utils.h" |
| 14 #include "content/public/common/content_switches.h" | 15 #include "content/public/common/content_switches.h" |
| 15 #include "content/public/test/browser_test_utils.h" | 16 #include "content/public/test/browser_test_utils.h" |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 | 112 |
| 112 EXPECT_EQ("1280x720", | 113 EXPECT_EQ("1280x720", |
| 113 GetUserMediaAndGetStreamSize(tab, kVideoCallConstraints720p)); | 114 GetUserMediaAndGetStreamSize(tab, kVideoCallConstraints720p)); |
| 114 EXPECT_EQ("1920x1080", | 115 EXPECT_EQ("1920x1080", |
| 115 GetUserMediaAndGetStreamSize(tab, kVideoCallConstraints1080p)); | 116 GetUserMediaAndGetStreamSize(tab, kVideoCallConstraints1080p)); |
| 116 } | 117 } |
| 117 | 118 |
| 118 INSTANTIATE_TEST_CASE_P(WebRtcWebcamBrowserTests, | 119 INSTANTIATE_TEST_CASE_P(WebRtcWebcamBrowserTests, |
| 119 WebRtcWebcamBrowserTest, | 120 WebRtcWebcamBrowserTest, |
| 120 testing::ValuesIn(kTestConfigFlags)); | 121 testing::ValuesIn(kTestConfigFlags)); |
| OLD | NEW |