From fb575bc7182f8ecde6ede7a4978b64a72434fd02 Mon Sep 17 00:00:00 2001 From: "dpolukhin@chromium.org" Date: Wed, 16 Nov 2011 07:06:24 +0000 Subject: Remove 'Flash' from TCP/UDP Pepper interfaces names. This CL preserves old idl and C/C++ headers for backward compatibility. Also TCP interface should be returned by old name. BUG=none TEST=build Review URL: http://codereview.chromium.org/8506016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110265 0039d316-1c4b-4281-b951-d872f2087c98 --- ppapi/tests/test_tcp_socket_private.cc | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'ppapi/tests/test_tcp_socket_private.cc') diff --git a/ppapi/tests/test_tcp_socket_private.cc b/ppapi/tests/test_tcp_socket_private.cc index d45746c..d7a6a3f 100644 --- a/ppapi/tests/test_tcp_socket_private.cc +++ b/ppapi/tests/test_tcp_socket_private.cc @@ -9,7 +9,7 @@ #include "base/string_split.h" #include "ppapi/c/dev/ppb_url_util_dev.h" #include "ppapi/cpp/dev/url_util_dev.h" -#include "ppapi/cpp/private/flash_tcp_socket.h" +#include "ppapi/cpp/private/tcp_socket_private.h" #include "ppapi/cpp/var.h" #include "ppapi/tests/testing_instance.h" #include "ppapi/tests/test_utils.h" @@ -33,7 +33,7 @@ TestTCPSocketPrivate::TestTCPSocketPrivate(TestingInstance* instance) } bool TestTCPSocketPrivate::Init() { - if (!TCPSocketPrivate::IsAvailable()) + if (!pp::TCPSocketPrivate::IsAvailable()) return false; // This test currently only works out-of-process (since the API is really only @@ -87,7 +87,7 @@ void TestTCPSocketPrivate::RunTests(const std::string& filter) { } std::string TestTCPSocketPrivate::TestBasic() { - TCPSocketPrivate socket(instance_); + pp::TCPSocketPrivate socket(instance_); TestCompletionCallback cb(instance_->pp_instance(), force_async_); int32_t rv = socket.Connect(host_.c_str(), port_, cb); @@ -107,7 +107,7 @@ std::string TestTCPSocketPrivate::TestBasic() { } std::string TestTCPSocketPrivate::TestReadWrite() { - TCPSocketPrivate socket(instance_); + pp::TCPSocketPrivate socket(instance_); TestCompletionCallback cb(instance_->pp_instance(), force_async_); int32_t rv = socket.Connect(host_.c_str(), port_, cb); @@ -133,7 +133,7 @@ std::string TestTCPSocketPrivate::TestConnectAddress() { // First, bring up a connection and grab the address. { - TCPSocketPrivate socket(instance_); + pp::TCPSocketPrivate socket(instance_); TestCompletionCallback cb(instance_->pp_instance(), force_async_); int32_t rv = socket.Connect(host_.c_str(), port_, cb); ASSERT_TRUE(!force_async_ || rv == PP_OK_COMPLETIONPENDING); @@ -146,7 +146,7 @@ std::string TestTCPSocketPrivate::TestConnectAddress() { } // Connect to that address. - TCPSocketPrivate socket(instance_); + pp::TCPSocketPrivate socket(instance_); TestCompletionCallback cb(instance_->pp_instance(), force_async_); int32_t rv = socket.ConnectWithNetAddress(&address, cb); ASSERT_TRUE(!force_async_ || rv == PP_OK_COMPLETIONPENDING); @@ -167,8 +167,9 @@ std::string TestTCPSocketPrivate::TestConnectAddress() { // TODO(viettrungluu): Try testing SSL somehow. -int32_t TestTCPSocketPrivate::ReadFirstLineFromSocket(TCPSocketPrivate* socket, - std::string* s) { +int32_t TestTCPSocketPrivate::ReadFirstLineFromSocket( + pp::TCPSocketPrivate* socket, + std::string* s) { char buffer[10000]; s->clear(); @@ -194,7 +195,7 @@ int32_t TestTCPSocketPrivate::ReadFirstLineFromSocket(TCPSocketPrivate* socket, return PP_ERROR_FAILED; } -int32_t TestTCPSocketPrivate::WriteStringToSocket(TCPSocketPrivate* socket, +int32_t TestTCPSocketPrivate::WriteStringToSocket(pp::TCPSocketPrivate* socket, const std::string& s) { const char* buffer = s.data(); size_t written = 0; -- cgit v1.1