| Index: ppapi/thunk/ppb_flash_tcp_socket_thunk.cc
|
| diff --git a/ppapi/thunk/ppb_flash_tcp_socket_thunk.cc b/ppapi/thunk/ppb_flash_tcp_socket_thunk.cc
|
| index 6154d602035615b97bc41242741aa9c921b60ab4..97a0ec9a360d4813c96447498f4a4528899609ff 100644
|
| --- a/ppapi/thunk/ppb_flash_tcp_socket_thunk.cc
|
| +++ b/ppapi/thunk/ppb_flash_tcp_socket_thunk.cc
|
| @@ -65,13 +65,14 @@ PP_Bool GetRemoteAddress(PP_Resource tcp_socket,
|
| return enter.object()->GetRemoteAddress(remote_addr);
|
| }
|
|
|
| -int32_t InitiateSSL(PP_Resource tcp_socket,
|
| - const char* server_name,
|
| - PP_CompletionCallback callback) {
|
| +int32_t SSLHandshake(PP_Resource tcp_socket,
|
| + const char* host,
|
| + uint16_t port,
|
| + PP_CompletionCallback callback) {
|
| EnterResource<PPB_Flash_TCPSocket_API> enter(tcp_socket, true);
|
| if (enter.failed())
|
| return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
|
| - int32_t result = enter.object()->InitiateSSL(server_name, callback);
|
| + int32_t result = enter.object()->SSLHandshake(host, port, callback);
|
| return MayForceCallback(callback, result);
|
| }
|
|
|
| @@ -110,7 +111,7 @@ const PPB_Flash_TCPSocket g_ppb_flash_tcp_socket_thunk = {
|
| &ConnectWithNetAddress,
|
| &GetLocalAddress,
|
| &GetRemoteAddress,
|
| - &InitiateSSL,
|
| + &SSLHandshake,
|
| &Read,
|
| &Write,
|
| &Disconnect
|
|
|