WebSocket Pepper API: make the API out of dev

ppapi/thunk/ppb_websocket_thunk.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 "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/thunk/common.h"
 #include "ppapi/thunk/thunk.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_websocket_api.h"
@@ skipping 92 matching lines @@
   return enter.object()->GetExtensions();
 }
 
 PP_Var GetProtocol(PP_Resource resource) {
   EnterResource<PPB_WebSocket_API> enter(resource, false);
   if (enter.failed())
     return PP_MakeUndefined();
   return enter.object()->GetProtocol();
 }
 
-PP_WebSocketReadyState_Dev GetReadyState(PP_Resource resource) {
+PP_WebSocketReadyState GetReadyState(PP_Resource resource) {
   EnterResource<PPB_WebSocket_API> enter(resource, false);
   if (enter.failed())
-    return PP_WEBSOCKETREADYSTATE_INVALID_DEV;
+    return PP_WEBSOCKETREADYSTATE_INVALID;
   return enter.object()->GetReadyState();
 }
 
 PP_Var GetURL(PP_Resource resource) {
   EnterResource<PPB_WebSocket_API> enter(resource, false);
   if (enter.failed())
     return PP_MakeUndefined();
   return enter.object()->GetURL();
 }
 
-PP_Bool SetBinaryType(PP_Resource resource,
-                      PP_WebSocketBinaryType_Dev binary_type) {
-  EnterResource<PPB_WebSocket_API> enter(resource, false);
-  if (enter.failed())
-    return PP_FALSE;
-  return enter.object()->SetBinaryType(binary_type);
-}
-
-PP_WebSocketBinaryType_Dev GetBinaryType(PP_Resource resource) {
-  EnterResource<PPB_WebSocket_API> enter(resource, false);
-  if (enter.failed())
-    return PP_WEBSOCKETBINARYTYPE_INVALID;
-  return enter.object()->GetBinaryType();
-}
-
-const PPB_WebSocket_Dev_0_1 g_ppb_websocket_0_1_thunk = {
+const PPB_WebSocket_1_0 g_ppb_websocket_1_0_thunk = {
   &Create,
   &IsWebSocket,
   &Connect,
-  &Close,
-  &ReceiveMessage,
-  &SendMessage,
-  &GetBufferedAmount,
-  &GetCloseCode,
-  &GetCloseReason,
-  &GetCloseWasClean,
-  &GetExtensions,
-  &GetProtocol,
-  &GetReadyState,
-  &GetURL
-};
-
-const PPB_WebSocket_Dev_0_9 g_ppb_websocket_0_9_thunk = {
-  &Create,
-  &IsWebSocket,
-  &Connect,
   &Close,
   &ReceiveMessage,
   &SendMessage,
   &GetBufferedAmount,
   &GetCloseCode,
   &GetCloseReason,
   &GetCloseWasClean,
   &GetExtensions,
   &GetProtocol,
   &GetReadyState,
   &GetURL,
-  &SetBinaryType,
-  &GetBinaryType
 };
 
 }  // namespace
 
-const PPB_WebSocket_Dev_0_1* GetPPB_WebSocket_Dev_0_1_Thunk() {
-  return &g_ppb_websocket_0_1_thunk;
-}
-
-const PPB_WebSocket_Dev_0_9* GetPPB_WebSocket_Dev_0_9_Thunk() {
-  return &g_ppb_websocket_0_9_thunk;
+const PPB_WebSocket_1_0* GetPPB_WebSocket_1_0_Thunk() {
+  return &g_ppb_websocket_1_0_thunk;
 }
 
 }  // namespace thunk
 }  // namespace ppapi