Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(307)

Side by Side Diff: trunk/src/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc

Issue 258733010: Revert 266273 "Disable TabCaptureApiPixelTest::EndToEnd - failin..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 // http://crbug.com/367349 91 IN_PROC_BROWSER_TEST_F(TabCaptureApiPixelTest, MAYBE_EndToEnd) {
92 IN_PROC_BROWSER_TEST_F(TabCaptureApiPixelTest, DISABLED_EndToEnd) {
93 #if defined(OS_WIN) 92 #if defined(OS_WIN)
94 // TODO(justinlin): Disabled for WinXP due to timeout issues. 93 // TODO(justinlin): Disabled for WinXP due to timeout issues.
95 if (base::win::GetVersion() < base::win::VERSION_VISTA) { 94 if (base::win::GetVersion() < base::win::VERSION_VISTA) {
96 return; 95 return;
97 } 96 }
98 #endif 97 #endif
99 // This test is too slow to succeed with OSMesa on the bots. 98 // This test is too slow to succeed with OSMesa on the bots.
100 if (UsingOSMesa()) 99 if (UsingOSMesa())
101 return; 100 return;
102 101
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 #if defined(OS_WIN) && !defined(NDEBUG) 290 #if defined(OS_WIN) && !defined(NDEBUG)
292 #define MAYBE_Constraints DISABLED_Constraints 291 #define MAYBE_Constraints DISABLED_Constraints
293 #else 292 #else
294 #define MAYBE_Constraints Constraints 293 #define MAYBE_Constraints Constraints
295 #endif 294 #endif
296 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_Constraints) { 295 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_Constraints) {
297 AddExtensionToCommandLineWhitelist(); 296 AddExtensionToCommandLineWhitelist();
298 ASSERT_TRUE(RunExtensionSubtest("tab_capture", "constraints.html")) 297 ASSERT_TRUE(RunExtensionSubtest("tab_capture", "constraints.html"))
299 << message_; 298 << message_;
300 } 299 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698