| 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/public/common/content_switches.h" | 9 #include "content/public/common/content_switches.h" |
| 10 #include "chrome/common/chrome_switches.h" | 10 #include "chrome/common/chrome_switches.h" |
| (...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 304 #endif // ENABLE_P2P_APIS | 304 #endif // ENABLE_P2P_APIS |
| 305 | 305 |
| 306 TEST_PPAPI_IN_PROCESS(UMA) | 306 TEST_PPAPI_IN_PROCESS(UMA) |
| 307 // There is no proxy. | 307 // There is no proxy. |
| 308 TEST_F(OutOfProcessPPAPITest, FAILS_UMA) { | 308 TEST_F(OutOfProcessPPAPITest, FAILS_UMA) { |
| 309 RunTest("UMA"); | 309 RunTest("UMA"); |
| 310 } | 310 } |
| 311 | 311 |
| 312 TEST_PPAPI_IN_PROCESS(NetAddressPrivate) | 312 TEST_PPAPI_IN_PROCESS(NetAddressPrivate) |
| 313 TEST_PPAPI_OUT_OF_PROCESS(NetAddressPrivate) | 313 TEST_PPAPI_OUT_OF_PROCESS(NetAddressPrivate) |
| 314 |
| 315 // PPB_TCPSocket_Private currently isn't supported in-process. |
| 316 TEST_F(OutOfProcessPPAPITest, TCPSocketPrivate) { |
| 317 RunTestViaHTTP("TCPSocketPrivate"); |
| 318 } |
| OLD | NEW |