| OLD | NEW |
| 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 "base/basictypes.h" | 5 #include "base/basictypes.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
| 8 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
| 9 #include "base/time/time.h" | 9 #include "base/time/time.h" |
| 10 #include "chrome/browser/extensions/extension_apitest.h" | 10 #include "chrome/browser/extensions/extension_apitest.h" |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 } | 88 } |
| 89 }; | 89 }; |
| 90 | 90 |
| 91 // Tests API behaviors, including info queries, and constraints violations. | 91 // Tests API behaviors, including info queries, and constraints violations. |
| 92 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, ApiTests) { | 92 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, ApiTests) { |
| 93 AddExtensionToCommandLineWhitelist(); | 93 AddExtensionToCommandLineWhitelist(); |
| 94 ASSERT_TRUE(RunExtensionSubtest("tab_capture", "api_tests.html")) << message_; | 94 ASSERT_TRUE(RunExtensionSubtest("tab_capture", "api_tests.html")) << message_; |
| 95 } | 95 } |
| 96 | 96 |
| 97 // Tests that tab capture video frames can be received in a VIDEO element. | 97 // Tests that tab capture video frames can be received in a VIDEO element. |
| 98 IN_PROC_BROWSER_TEST_F(TabCaptureApiPixelTest, EndToEndWithoutRemoting) { | 98 // Disabled due to flakiness. http://crbug.com/468606. |
| 99 IN_PROC_BROWSER_TEST_F(TabCaptureApiPixelTest, |
| 100 DISABLED_EndToEndWithoutRemoting) { |
| 99 if (IsTooIntensiveForThisPlatform()) { | 101 if (IsTooIntensiveForThisPlatform()) { |
| 100 LOG(WARNING) << "Skipping this CPU-intensive test on this platform/build."; | 102 LOG(WARNING) << "Skipping this CPU-intensive test on this platform/build."; |
| 101 return; | 103 return; |
| 102 } | 104 } |
| 103 AddExtensionToCommandLineWhitelist(); | 105 AddExtensionToCommandLineWhitelist(); |
| 104 ASSERT_TRUE(RunExtensionSubtest( | 106 ASSERT_TRUE(RunExtensionSubtest( |
| 105 "tab_capture", "end_to_end.html?method=local&colorDeviation=10")) | 107 "tab_capture", "end_to_end.html?method=local&colorDeviation=10")) |
| 106 << message_; | 108 << message_; |
| 107 } | 109 } |
| 108 | 110 |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 292 #define MAYBE_Constraints Constraints | 294 #define MAYBE_Constraints Constraints |
| 293 #endif | 295 #endif |
| 294 // Tests that valid constraints allow tab capture to start, while invalid ones | 296 // Tests that valid constraints allow tab capture to start, while invalid ones |
| 295 // do not. | 297 // do not. |
| 296 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_Constraints) { | 298 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_Constraints) { |
| 297 AddExtensionToCommandLineWhitelist(); | 299 AddExtensionToCommandLineWhitelist(); |
| 298 ASSERT_TRUE(RunExtensionSubtest("tab_capture", "constraints.html")) | 300 ASSERT_TRUE(RunExtensionSubtest("tab_capture", "constraints.html")) |
| 299 << message_; | 301 << message_; |
| 300 } | 302 } |
| 301 | 303 |
| 302 // Flaky on Windows: http://crbug.com/177163 | |
| 303 // Flaky on Linux ASan: http://crbug.com/468256 | |
| 304 #if (defined(OS_WIN) && !defined(NDEBUG)) || \ | |
| 305 (defined(OS_LINUX) && defined(ADDRESS_SANITIZER)) | |
| 306 #define MAYBE_TabIndicator DISABLED_TabIndicator | |
| 307 #else | |
| 308 #define MAYBE_TabIndicator TabIndicator | |
| 309 #endif | |
| 310 // Tests that the tab indicator (in the tab strip) is shown during tab capture. | 304 // Tests that the tab indicator (in the tab strip) is shown during tab capture. |
| 311 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_TabIndicator) { | 305 // Disabled due to flakiness. http://crbug.com/468608 |
| 306 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, DISABLED_TabIndicator) { |
| 312 ASSERT_EQ(TAB_MEDIA_STATE_NONE, | 307 ASSERT_EQ(TAB_MEDIA_STATE_NONE, |
| 313 chrome::GetTabMediaStateForContents( | 308 chrome::GetTabMediaStateForContents( |
| 314 browser()->tab_strip_model()->GetActiveWebContents())); | 309 browser()->tab_strip_model()->GetActiveWebContents())); |
| 315 | 310 |
| 316 // Run an extension test that just turns on tab capture, which should cause | 311 // Run an extension test that just turns on tab capture, which should cause |
| 317 // the indicator to turn on. | 312 // the indicator to turn on. |
| 318 AddExtensionToCommandLineWhitelist(); | 313 AddExtensionToCommandLineWhitelist(); |
| 319 ASSERT_TRUE(RunExtensionSubtest("tab_capture", "start_tab_capture.html")) | 314 ASSERT_TRUE(RunExtensionSubtest("tab_capture", "start_tab_capture.html")) |
| 320 << message_; | 315 << message_; |
| 321 | 316 |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 358 return; | 353 return; |
| 359 } | 354 } |
| 360 content::RunMessageLoop(); | 355 content::RunMessageLoop(); |
| 361 } | 356 } |
| 362 browser()->tab_strip_model()->RemoveObserver(&observer); | 357 browser()->tab_strip_model()->RemoveObserver(&observer); |
| 363 } | 358 } |
| 364 | 359 |
| 365 } // namespace | 360 } // namespace |
| 366 | 361 |
| 367 } // namespace extensions | 362 } // namespace extensions |
| OLD | NEW |