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 #if defined(OS_MACOSX) | 7 #if defined(OS_MACOSX) |
8 #include "base/mac/mac_util.h" | 8 #include "base/mac/mac_util.h" |
9 #endif | 9 #endif |
10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
81 ASSERT_TRUE(RunExtensionSubtest("tab_capture", "api_tests_audio.html")) | 81 ASSERT_TRUE(RunExtensionSubtest("tab_capture", "api_tests_audio.html")) |
82 << message_; | 82 << message_; |
83 } | 83 } |
84 | 84 |
85 // http://crbug.com/177163 | 85 // http://crbug.com/177163 |
86 #if !defined(NDEBUG) | 86 #if !defined(NDEBUG) |
87 #define MAYBE_EndToEnd DISABLED_EndToEnd | 87 #define MAYBE_EndToEnd DISABLED_EndToEnd |
88 #else | 88 #else |
89 #define MAYBE_EndToEnd EndToEnd | 89 #define MAYBE_EndToEnd EndToEnd |
90 #endif | 90 #endif |
91 IN_PROC_BROWSER_TEST_F(TabCaptureApiPixelTest, MAYBE_EndToEnd) { | 91 // http://crbug.com/367349 |
| 92 IN_PROC_BROWSER_TEST_F(TabCaptureApiPixelTest, DISABLED_EndToEnd) { |
92 #if defined(OS_WIN) | 93 #if defined(OS_WIN) |
93 // TODO(justinlin): Disabled for WinXP due to timeout issues. | 94 // TODO(justinlin): Disabled for WinXP due to timeout issues. |
94 if (base::win::GetVersion() < base::win::VERSION_VISTA) { | 95 if (base::win::GetVersion() < base::win::VERSION_VISTA) { |
95 return; | 96 return; |
96 } | 97 } |
97 #endif | 98 #endif |
98 // This test is too slow to succeed with OSMesa on the bots. | 99 // This test is too slow to succeed with OSMesa on the bots. |
99 if (UsingOSMesa()) | 100 if (UsingOSMesa()) |
100 return; | 101 return; |
101 | 102 |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
290 #if defined(OS_WIN) && !defined(NDEBUG) | 291 #if defined(OS_WIN) && !defined(NDEBUG) |
291 #define MAYBE_Constraints DISABLED_Constraints | 292 #define MAYBE_Constraints DISABLED_Constraints |
292 #else | 293 #else |
293 #define MAYBE_Constraints Constraints | 294 #define MAYBE_Constraints Constraints |
294 #endif | 295 #endif |
295 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_Constraints) { | 296 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_Constraints) { |
296 AddExtensionToCommandLineWhitelist(); | 297 AddExtensionToCommandLineWhitelist(); |
297 ASSERT_TRUE(RunExtensionSubtest("tab_capture", "constraints.html")) | 298 ASSERT_TRUE(RunExtensionSubtest("tab_capture", "constraints.html")) |
298 << message_; | 299 << message_; |
299 } | 300 } |
OLD | NEW |