| 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 "content/browser/plugin_service.h" | 9 #include "content/browser/plugin_service.h" |
| 10 #include "content/public/common/content_switches.h" | 10 #include "content/public/common/content_switches.h" |
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 264 #if defined(OS_WIN) | 264 #if defined(OS_WIN) |
| 265 // It often takes too long time (and fails otherwise) on Windows. | 265 // It often takes too long time (and fails otherwise) on Windows. |
| 266 #define MAYBE_URLLoader DISABLED_URLLoader | 266 #define MAYBE_URLLoader DISABLED_URLLoader |
| 267 #else | 267 #else |
| 268 #define MAYBE_URLLoader FAILS_URLLoader | 268 #define MAYBE_URLLoader FAILS_URLLoader |
| 269 #endif | 269 #endif |
| 270 TEST_F(OutOfProcessPPAPITest, MAYBE_URLLoader) { | 270 TEST_F(OutOfProcessPPAPITest, MAYBE_URLLoader) { |
| 271 RunTestViaHTTP("URLLoader"); | 271 RunTestViaHTTP("URLLoader"); |
| 272 } | 272 } |
| 273 | 273 |
| 274 | 274 // http://crbug.com/104832 |
| 275 | 275 #if defined(ADDRESS_SANITIZER) |
| 276 #define MAYBE_PaintAggregator DISABLED_PaintAggregator |
| 277 #else |
| 278 #define MAYBE_PaintAggregator PaintAggregator |
| 279 #endif |
| 276 TEST_PPAPI_IN_PROCESS(PaintAggregator) | 280 TEST_PPAPI_IN_PROCESS(PaintAggregator) |
| 277 TEST_PPAPI_OUT_OF_PROCESS(PaintAggregator) | 281 TEST_F(OutOfProcessPPAPITest, MAYBE_PaintAggregator) { |
| 282 RunTest("PaintAggregator"); |
| 283 } |
| 278 TEST_PPAPI_NACL_VIA_HTTP(PaintAggregator) | 284 TEST_PPAPI_NACL_VIA_HTTP(PaintAggregator) |
| 279 | 285 |
| 286 #if defined(ADDRESS_SANITIZER) |
| 287 #define MAYBE_Scrollbar DISABLED_Scrollbar |
| 288 #else |
| 289 #define MAYBE_Scrollbar FAILS_Scrollbar |
| 290 #endif |
| 280 TEST_PPAPI_IN_PROCESS(Scrollbar) | 291 TEST_PPAPI_IN_PROCESS(Scrollbar) |
| 281 // http://crbug.com/89961 | 292 // http://crbug.com/89961 |
| 282 TEST_F(OutOfProcessPPAPITest, FAILS_Scrollbar) { | 293 // http://crbug.com/104832 |
| 294 TEST_F(OutOfProcessPPAPITest, MAYBE_Scrollbar) { |
| 283 RunTest("Scrollbar"); | 295 RunTest("Scrollbar"); |
| 284 } | 296 } |
| 285 TEST_PPAPI_NACL_VIA_HTTP(Scrollbar) | 297 TEST_PPAPI_NACL_VIA_HTTP(Scrollbar) |
| 286 | 298 |
| 287 TEST_PPAPI_IN_PROCESS(URLUtil) | 299 TEST_PPAPI_IN_PROCESS(URLUtil) |
| 288 TEST_PPAPI_OUT_OF_PROCESS(URLUtil) | 300 TEST_PPAPI_OUT_OF_PROCESS(URLUtil) |
| 289 | 301 |
| 290 TEST_PPAPI_IN_PROCESS(CharSet) | 302 TEST_PPAPI_IN_PROCESS(CharSet) |
| 291 TEST_PPAPI_OUT_OF_PROCESS(CharSet) | 303 TEST_PPAPI_OUT_OF_PROCESS(CharSet) |
| 292 | 304 |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 449 TEST_PPAPI_IN_PROCESS(Flash_GetLocalTimeZoneOffset) | 461 TEST_PPAPI_IN_PROCESS(Flash_GetLocalTimeZoneOffset) |
| 450 TEST_PPAPI_IN_PROCESS(Flash_GetCommandLineArgs) | 462 TEST_PPAPI_IN_PROCESS(Flash_GetCommandLineArgs) |
| 451 TEST_PPAPI_OUT_OF_PROCESS(Flash_SetInstanceAlwaysOnTop) | 463 TEST_PPAPI_OUT_OF_PROCESS(Flash_SetInstanceAlwaysOnTop) |
| 452 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetProxyForURL) | 464 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetProxyForURL) |
| 453 TEST_PPAPI_OUT_OF_PROCESS(Flash_MessageLoop) | 465 TEST_PPAPI_OUT_OF_PROCESS(Flash_MessageLoop) |
| 454 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetLocalTimeZoneOffset) | 466 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetLocalTimeZoneOffset) |
| 455 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetCommandLineArgs) | 467 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetCommandLineArgs) |
| 456 | 468 |
| 457 TEST_PPAPI_IN_PROCESS(WebSocket_Create) | 469 TEST_PPAPI_IN_PROCESS(WebSocket_Create) |
| 458 TEST_PPAPI_IN_PROCESS(WebSocket_IsWebSocket) | 470 TEST_PPAPI_IN_PROCESS(WebSocket_IsWebSocket) |
| OLD | NEW |