OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/file_util.h" | 5 #include "base/file_util.h" |
6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
7 #include "base/test/test_timeouts.h" | 7 #include "base/test/test_timeouts.h" |
8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
9 #include "chrome/common/chrome_switches.h" | 9 #include "chrome/common/chrome_switches.h" |
10 #include "chrome/test/automation/tab_proxy.h" | 10 #include "chrome/test/automation/tab_proxy.h" |
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
200 #define MAYBE_DirectoryReader FLAKY_DirectoryReader | 200 #define MAYBE_DirectoryReader FLAKY_DirectoryReader |
201 #else | 201 #else |
202 #define MAYBE_DirectoryReader DirectoryReader | 202 #define MAYBE_DirectoryReader DirectoryReader |
203 #endif | 203 #endif |
204 | 204 |
205 // Flaky on Mac + Linux, maybe http://codereview.chromium.org/7094008 | 205 // Flaky on Mac + Linux, maybe http://codereview.chromium.org/7094008 |
206 TEST_F(PPAPITest, MAYBE_DirectoryReader) { | 206 TEST_F(PPAPITest, MAYBE_DirectoryReader) { |
207 RunTestViaHTTP("DirectoryReader"); | 207 RunTestViaHTTP("DirectoryReader"); |
208 } | 208 } |
209 | 209 |
210 #if defined(OS_WIN) | |
211 // Flaky on Windows, bug 87210 | |
212 #define MAYBE_Transport FLAKY_Transport | |
213 #else | |
214 #define MAYBE_Transport Transport | |
215 #endif | |
216 | |
217 #if defined(ENABLE_P2P_APIS) | 210 #if defined(ENABLE_P2P_APIS) |
218 TEST_F(PPAPITest, MAYBE_Transport) { | 211 TEST_F(PPAPITest, Transport) { |
219 RunTest("Transport"); | 212 RunTest("Transport"); |
220 } | 213 } |
221 #endif // ENABLE_P2P_APIS | 214 #endif // ENABLE_P2P_APIS |
OLD | NEW |