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 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
379 RunTest("UMA"); | 379 RunTest("UMA"); |
380 } | 380 } |
381 | 381 |
382 TEST_PPAPI_IN_PROCESS(NetAddressPrivate) | 382 TEST_PPAPI_IN_PROCESS(NetAddressPrivate) |
383 TEST_PPAPI_OUT_OF_PROCESS(NetAddressPrivate) | 383 TEST_PPAPI_OUT_OF_PROCESS(NetAddressPrivate) |
384 | 384 |
385 // PPB_TCPSocket_Private currently isn't supported in-process. | 385 // PPB_TCPSocket_Private currently isn't supported in-process. |
386 TEST_F(OutOfProcessPPAPITest, TCPSocketPrivate) { | 386 TEST_F(OutOfProcessPPAPITest, TCPSocketPrivate) { |
387 RunTestViaHTTP("TCPSocketPrivate"); | 387 RunTestViaHTTP("TCPSocketPrivate"); |
388 } | 388 } |
389 | |
390 TEST_PPAPI_IN_PROCESS(WebSocket) | |
dmichael (off chromium)
2011/11/17 18:50:57
I just sent an e-mail about the new way of putting
Takashi Toyoshima
2011/11/18 05:01:19
Done.
| |
OLD | NEW |