| 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 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 // Disabled because it times out: http://crbug.com/89961 | 173 // Disabled because it times out: http://crbug.com/89961 |
| 174 //TEST_PPAPI_OUT_OF_PROCESS(Graphics2D) | 174 //TEST_PPAPI_OUT_OF_PROCESS(Graphics2D) |
| 175 | 175 |
| 176 TEST_PPAPI_IN_PROCESS(ImageData) | 176 TEST_PPAPI_IN_PROCESS(ImageData) |
| 177 TEST_PPAPI_OUT_OF_PROCESS(ImageData) | 177 TEST_PPAPI_OUT_OF_PROCESS(ImageData) |
| 178 | 178 |
| 179 TEST_PPAPI_IN_PROCESS(Buffer) | 179 TEST_PPAPI_IN_PROCESS(Buffer) |
| 180 TEST_PPAPI_OUT_OF_PROCESS(Buffer) | 180 TEST_PPAPI_OUT_OF_PROCESS(Buffer) |
| 181 | 181 |
| 182 TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader) | 182 TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader) |
| 183 |
| 183 // http://crbug.com/89961 | 184 // http://crbug.com/89961 |
| 184 TEST_F(OutOfProcessPPAPITest, FAILS_URLLoader) { | 185 #if defined(OS_WIN) |
| 186 // It often takes too long time (and fails otherwise) on Windows. |
| 187 #define MAYBE_URLLoader DISABLED_URLLoader |
| 188 #else |
| 189 #define MAYBE_URLLoader FAILS_URLLoader |
| 190 #endif |
| 191 |
| 192 TEST_F(OutOfProcessPPAPITest, MAYBE_URLLoader) { |
| 185 RunTestViaHTTP("URLLoader"); | 193 RunTestViaHTTP("URLLoader"); |
| 186 } | 194 } |
| 187 | 195 |
| 188 TEST_PPAPI_IN_PROCESS(PaintAggregator) | 196 TEST_PPAPI_IN_PROCESS(PaintAggregator) |
| 189 TEST_PPAPI_OUT_OF_PROCESS(PaintAggregator) | 197 TEST_PPAPI_OUT_OF_PROCESS(PaintAggregator) |
| 190 | 198 |
| 191 TEST_PPAPI_IN_PROCESS(Scrollbar) | 199 TEST_PPAPI_IN_PROCESS(Scrollbar) |
| 192 // http://crbug.com/89961 | 200 // http://crbug.com/89961 |
| 193 TEST_F(OutOfProcessPPAPITest, FAILS_Scrollbar) { | 201 TEST_F(OutOfProcessPPAPITest, FAILS_Scrollbar) { |
| 194 RunTest("Scrollbar"); | 202 RunTest("Scrollbar"); |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 TEST_F(OutOfProcessPPAPITest, FAILS_Transport) { | 280 TEST_F(OutOfProcessPPAPITest, FAILS_Transport) { |
| 273 RunTestViaHTTP("Transport"); | 281 RunTestViaHTTP("Transport"); |
| 274 } | 282 } |
| 275 #endif // ENABLE_P2P_APIS | 283 #endif // ENABLE_P2P_APIS |
| 276 | 284 |
| 277 TEST_PPAPI_IN_PROCESS(UMA) | 285 TEST_PPAPI_IN_PROCESS(UMA) |
| 278 // There is no proxy. | 286 // There is no proxy. |
| 279 TEST_F(OutOfProcessPPAPITest, FAILS_UMA) { | 287 TEST_F(OutOfProcessPPAPITest, FAILS_UMA) { |
| 280 RunTest("UMA"); | 288 RunTest("UMA"); |
| 281 } | 289 } |
| OLD | NEW |