WebSocket Pepper API: make the API out of dev

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

Index: ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_websocket_rpc_server.cc
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_websocket_rpc_server.cc b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_websocket_rpc_server.cc
index 01749fcf46fba679e516f02691de07abf626e6f9..65c08775d4ea4bc8662374a7bfda9395baf46f1f 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_websocket_rpc_server.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_websocket_rpc_server.cc
@@ -11,8 +11,8 @@
 #include "native_client/src/shared/ppapi_proxy/utility.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
-#include "ppapi/c/dev/ppb_websocket_dev.h"
 #include "srpcgen/ppb_rpc.h"
+#include "ppapi/c/ppb_websocket.h"
 
 using ppapi_proxy::DebugPrintf;
 using ppapi_proxy::DeleteRemoteCallbackInfo;
@@ -321,40 +321,3 @@ void PpbWebSocketRpcServer::PPB_WebSocket_GetURL(
   if (SerializeTo(&url, url_bytes, url_size))
     rpc->result = NACL_SRPC_RESULT_OK;
 }
-
-void PpbWebSocketRpcServer::PPB_WebSocket_SetBinaryType(
-    NaClSrpcRpc* rpc,
-    NaClSrpcClosure* done,
-    // inputs
-    PP_Resource ws,
-    int32_t binary_type,
-    // outputs
-    int32_t* success) {
-  NaClSrpcClosureRunner runner(done);
-  rpc->result = NACL_SRPC_RESULT_APP_ERROR;
-
-  PP_Bool pp_success = PPBWebSocketInterface()->SetBinaryType(
-      ws, static_cast<PP_WebSocketBinaryType_Dev>(binary_type));
-  *success = PP_ToBool(pp_success);
-  DebugPrintf("PPB_WebSocket::SetBinaryType:: success=%d\n", *success);
-
-  rpc->result = NACL_SRPC_RESULT_OK;
-}
-
-void PpbWebSocketRpcServer::PPB_WebSocket_GetBinaryType(
-    NaClSrpcRpc* rpc,
-    NaClSrpcClosure* done,
-    // inputs
-    PP_Resource ws,
-    // outputs
-    int32_t* binary_type) {
-  NaClSrpcClosureRunner runner(done);
-  rpc->result = NACL_SRPC_RESULT_APP_ERROR;
-
-  *binary_type = static_cast<int32_t>(
-      PPBWebSocketInterface()->GetBinaryType(ws));
-  DebugPrintf(
-      "PPB_WebSocket::GetBinaryType:: binary_type=%d\n", *binary_type);
-
-  rpc->result = NACL_SRPC_RESULT_OK;
-}