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" |
11 #include "content/common/pepper_plugin_registry.h" | 11 #include "content/common/pepper_plugin_registry.h" |
12 #include "chrome/common/chrome_paths.h" | 12 #include "chrome/common/chrome_paths.h" |
yzshen1
2011/11/21 23:55:03
This is probably not your change, but it would be
| |
13 #include "chrome/common/chrome_switches.h" | 13 #include "chrome/common/chrome_switches.h" |
14 #include "chrome/test/automation/tab_proxy.h" | 14 #include "chrome/test/automation/tab_proxy.h" |
15 #include "chrome/test/ui/ui_test.h" | 15 #include "chrome/test/ui/ui_test.h" |
16 #include "net/base/net_util.h" | 16 #include "net/base/net_util.h" |
17 #include "net/test/test_server.h" | 17 #include "net/test/test_server.h" |
18 #include "webkit/plugins/plugin_switches.h" | 18 #include "webkit/plugins/plugin_switches.h" |
19 | 19 |
20 | 20 |
21 namespace { | 21 namespace { |
22 | 22 |
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
417 RunTestViaHTTP("Transport"); | 417 RunTestViaHTTP("Transport"); |
418 } | 418 } |
419 #endif // ENABLE_P2P_APIS | 419 #endif // ENABLE_P2P_APIS |
420 | 420 |
421 TEST_PPAPI_IN_PROCESS(UMA) | 421 TEST_PPAPI_IN_PROCESS(UMA) |
422 // There is no proxy. | 422 // There is no proxy. |
423 TEST_F(OutOfProcessPPAPITest, FAILS_UMA) { | 423 TEST_F(OutOfProcessPPAPITest, FAILS_UMA) { |
424 RunTest("UMA"); | 424 RunTest("UMA"); |
425 } | 425 } |
426 | 426 |
427 TEST_PPAPI_IN_PROCESS(NetAddressPrivate) | 427 TEST_PPAPI_IN_PROCESS(NetAddressPrivate_AreEqual) |
428 TEST_PPAPI_OUT_OF_PROCESS(NetAddressPrivate) | 428 TEST_PPAPI_IN_PROCESS(NetAddressPrivate_AreHostsEqual) |
429 TEST_PPAPI_IN_PROCESS(NetAddressPrivate_Describe) | |
430 TEST_PPAPI_IN_PROCESS(NetAddressPrivate_ReplacePort) | |
431 TEST_PPAPI_IN_PROCESS(NetAddressPrivate_GetAnyAddress) | |
432 TEST_PPAPI_IN_PROCESS(NetAddressPrivate_DescribeIPv6) | |
433 TEST_PPAPI_OUT_OF_PROCESS(NetAddressPrivate_AreEqual) | |
434 TEST_PPAPI_OUT_OF_PROCESS(NetAddressPrivate_AreHostsEqual) | |
435 TEST_PPAPI_OUT_OF_PROCESS(NetAddressPrivate_Describe) | |
436 TEST_PPAPI_OUT_OF_PROCESS(NetAddressPrivate_ReplacePort) | |
437 TEST_PPAPI_OUT_OF_PROCESS(NetAddressPrivate_GetAnyAddress) | |
438 TEST_PPAPI_OUT_OF_PROCESS(NetAddressPrivate_DescribeIPv6) | |
429 | 439 |
430 // PPB_TCPSocket_Private currently isn't supported in-process. | 440 // PPB_TCPSocket_Private currently isn't supported in-process. |
431 TEST_F(OutOfProcessPPAPITest, TCPSocketPrivate) { | 441 TEST_F(OutOfProcessPPAPITest, TCPSocketPrivate) { |
432 RunTestViaHTTP("TCPSocketPrivate"); | 442 RunTestViaHTTP("TCPSocketPrivate"); |
433 } | 443 } |
434 | 444 |
435 TEST_PPAPI_IN_PROCESS(Flash_SetInstanceAlwaysOnTop) | 445 TEST_PPAPI_IN_PROCESS(Flash_SetInstanceAlwaysOnTop) |
436 TEST_PPAPI_IN_PROCESS(Flash_GetProxyForURL) | 446 TEST_PPAPI_IN_PROCESS(Flash_GetProxyForURL) |
437 TEST_PPAPI_IN_PROCESS(Flash_MessageLoop) | 447 TEST_PPAPI_IN_PROCESS(Flash_MessageLoop) |
438 TEST_PPAPI_IN_PROCESS(Flash_GetLocalTimeZoneOffset) | 448 TEST_PPAPI_IN_PROCESS(Flash_GetLocalTimeZoneOffset) |
439 TEST_PPAPI_IN_PROCESS(Flash_GetCommandLineArgs) | 449 TEST_PPAPI_IN_PROCESS(Flash_GetCommandLineArgs) |
440 TEST_PPAPI_OUT_OF_PROCESS(Flash_SetInstanceAlwaysOnTop) | 450 TEST_PPAPI_OUT_OF_PROCESS(Flash_SetInstanceAlwaysOnTop) |
441 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetProxyForURL) | 451 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetProxyForURL) |
442 TEST_PPAPI_OUT_OF_PROCESS(Flash_MessageLoop) | 452 TEST_PPAPI_OUT_OF_PROCESS(Flash_MessageLoop) |
443 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetLocalTimeZoneOffset) | 453 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetLocalTimeZoneOffset) |
444 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetCommandLineArgs) | 454 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetCommandLineArgs) |
445 | 455 |
446 TEST_PPAPI_IN_PROCESS(WebSocket_Create) | 456 TEST_PPAPI_IN_PROCESS(WebSocket_Create) |
447 TEST_PPAPI_IN_PROCESS(WebSocket_IsWebSocket) | 457 TEST_PPAPI_IN_PROCESS(WebSocket_IsWebSocket) |
OLD | NEW |