WebSocket Pepper API: make the API out of dev

ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_websocket.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "native_client/src/shared/ppapi_proxy/plugin_ppb_websocket.h"
 
 #include "native_client/src/include/nacl_scoped_ptr.h"
 #include "native_client/src/shared/ppapi_proxy/object_serialize.h"
 #include "native_client/src/shared/ppapi_proxy/plugin_callback.h"
 #include "native_client/src/shared/ppapi_proxy/plugin_globals.h"
 #include "native_client/src/shared/ppapi_proxy/utility.h"
 #include "native_client/src/shared/srpc/nacl_srpc.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_var.h"
-#include "ppapi/c/dev/ppb_websocket_dev.h"
+#include "ppapi/c/ppb_websocket.h"
 #include "srpcgen/ppb_rpc.h"
 
 namespace ppapi_proxy {
 
 namespace {
 
 PP_Resource Create(PP_Instance instance) {
   DebugPrintf("PPB_WebSocket::Create: instance=%"NACL_PRId32"\n", instance);
 
   PP_Resource resource;
@@ skipping 233 matching lines @@
 
   if (srpc_result == NACL_SRPC_RESULT_OK) {
     PP_Var protocol = PP_MakeUndefined();
     if (DeserializeTo(protocol_bytes.get(), protocol_size, 1, &protocol))
       return protocol;
   }
 
   return PP_MakeUndefined();
 }
 
-PP_WebSocketReadyState_Dev GetReadyState(PP_Resource ws) {
+PP_WebSocketReadyState GetReadyState(PP_Resource ws) {
   DebugPrintf(
       "PPB_WebSocket::GetReadyState: ws=%"NACL_PRId32"\n", ws);
 
   int32_t ready_state;
   NaClSrpcError srpc_result =
       PpbWebSocketRpcClient::PPB_WebSocket_GetReadyState(
           GetMainSrpcChannel(), ws, &ready_state);
   DebugPrintf("PPB_WebSocket::GetReadyState: %s\n",
       NaClSrpcErrorString(srpc_result));
 
   if (srpc_result != NACL_SRPC_RESULT_OK)
-    return PP_WEBSOCKETREADYSTATE_INVALID_DEV;
-  return static_cast<PP_WebSocketReadyState_Dev>(ready_state);
+    return PP_WEBSOCKETREADYSTATE_INVALID;
+  return static_cast<PP_WebSocketReadyState>(ready_state);
 }
 
 PP_Var GetURL(PP_Resource ws) {
   DebugPrintf("PPB_WebSocket::GetURL: ws=%"NACL_PRId32"\n", ws);
 
   nacl_abi_size_t url_size = kMaxReturnVarSize;
   nacl::scoped_array<char> url_bytes(new char[url_size]);
   NaClSrpcError srpc_result =
       PpbWebSocketRpcClient::PPB_WebSocket_GetURL(
           GetMainSrpcChannel(), ws, &url_size, url_bytes.get());
   DebugPrintf("PPB_WebSocket::GetURL: %s\n",
       NaClSrpcErrorString(srpc_result));
 
   if (srpc_result == NACL_SRPC_RESULT_OK) {
     PP_Var url = PP_MakeUndefined();
     if (DeserializeTo(url_bytes.get(), url_size, 1, &url))
       return url;
   }
 
   return PP_MakeUndefined();
 }
 
-PP_Bool SetBinaryType(PP_Resource ws,
-                      PP_WebSocketBinaryType_Dev binary_type) {
-  DebugPrintf("PPB_WebSocket::SetBinaryType: ws=%"NACL_PRId32"\n", ws);
-
-  int32_t success;
-  NaClSrpcError srpc_result =
-      PpbWebSocketRpcClient::PPB_WebSocket_SetBinaryType(
-          GetMainSrpcChannel(),
-          ws,
-          static_cast<int32_t>(binary_type),
-          &success);
-  DebugPrintf("PPB_WebSocket::SetBinaryType: %s\n",
-      NaClSrpcErrorString(srpc_result));
-
-  if (srpc_result == NACL_SRPC_RESULT_OK && success)
-    return PP_TRUE;
-  return PP_FALSE;
-}
-
-PP_WebSocketBinaryType_Dev GetBinaryType(PP_Resource ws) {
-  DebugPrintf("PPB_WebSocket::GetBinaryType: ws=%"NACL_PRId32"\n", ws);
-
-  int32_t binary_type;
-  NaClSrpcError srpc_result =
-      PpbWebSocketRpcClient::PPB_WebSocket_GetBinaryType(
-          GetMainSrpcChannel(),
-          ws,
-          &binary_type);
-  DebugPrintf("PPB_WebSocket::GetBinaryType: %s\n",
-      NaClSrpcErrorString(srpc_result));
-
-  if (srpc_result != NACL_SRPC_RESULT_OK)
-    return PP_WEBSOCKETBINARYTYPE_INVALID;
-  return static_cast<PP_WebSocketBinaryType_Dev>(binary_type);
-}
-
 }  // namespace
 
-const PPB_WebSocket_Dev* PluginWebSocket::GetInterface() {
-  static const PPB_WebSocket_Dev websocket_interface = {
+const PPB_WebSocket* PluginWebSocket::GetInterface() {
+  static const PPB_WebSocket websocket_interface = {
     &Create,
     &IsWebSocket,
     &Connect,
     &Close,
     &ReceiveMessage,
     &SendMessage,
     &GetBufferedAmount,
     &GetCloseCode,
     &GetCloseReason,
     &GetCloseWasClean,
     &GetExtensions,
     &GetProtocol,
     &GetReadyState,
     &GetURL,
-    &SetBinaryType,
-    &GetBinaryType
   };
   return &websocket_interface;
 }
 
 }  // namespace ppapi_proxy