WebSocket Pepper API: Remove binary type handling interfaces

webkit/plugins/ppapi/ppb_websocket_impl.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 "webkit/plugins/ppapi/ppb_websocket_impl.h"
 
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 62 matching lines @@
 }
 
 }  // namespace
 
 namespace webkit {
 namespace ppapi {
 
 PPB_WebSocket_Impl::PPB_WebSocket_Impl(PP_Instance instance)
     : Resource(instance),
       state_(PP_WEBSOCKETREADYSTATE_INVALID_DEV),
-      binary_type_(WebSocket::BinaryTypeBlob),
       error_was_received_(false),
       receive_callback_var_(NULL),
       wait_for_receive_(false),
       close_code_(0),
       close_was_clean_(PP_FALSE),
       empty_string_(new StringVar("", 0)),
       buffered_amount_(0),
       buffered_amount_after_close_(0) {
 }
 
@@ skipping 95 matching lines @@
     return PP_ERROR_BLOCKS_MAIN_THREAD;
 
   // Create WebKit::WebSocket object and connect.
   WebDocument document = plugin_instance->container()->element().document();
   websocket_.reset(WebSocket::create(document, this));
   DCHECK(websocket_.get());
   if (!websocket_.get())
     return PP_ERROR_NOTSUPPORTED;
 
   // Set receiving binary object type.
-  websocket_->setBinaryType(binary_type_);
+  websocket_->setBinaryType(WebSocket::BinaryTypeArrayBuffer);
 
   websocket_->connect(web_url, web_protocols);
   state_ = PP_WEBSOCKETREADYSTATE_CONNECTING_DEV;
 
   // Install callback.
   connect_callback_ = new TrackedCallback(this, callback);
 
   return PP_OK_COMPLETIONPENDING;
 }
 
@@ skipping 196 matching lines @@
 PP_WebSocketReadyState_Dev PPB_WebSocket_Impl::GetReadyState() {
   return state_;
 }
 
 PP_Var PPB_WebSocket_Impl::GetURL() {
   if (!url_)
     return empty_string_->GetPPVar();
   return url_->GetPPVar();
 }
 
-PP_Bool PPB_WebSocket_Impl::SetBinaryType(
-    PP_WebSocketBinaryType_Dev binary_type) {
-  switch (binary_type) {
-    case PP_WEBSOCKETBINARYTYPE_BLOB_DEV:
-      binary_type_ = WebSocket::BinaryTypeBlob;
-      break;
-    case PP_WEBSOCKETBINARYTYPE_ARRAYBUFFER_DEV:
-      binary_type_ = WebSocket::BinaryTypeArrayBuffer;
-      break;
-    default:
-      return PP_FALSE;
-  }
-  // WebKit API setBinaryType() is called when Connect() is called.
-  // If the websocket_ contains an object; it means Connect() is already
-  // called, call WebKit API here to reflect the setting as soon as possible.
-  if (websocket_.get())
-    websocket_->setBinaryType(binary_type_);
-  return PP_TRUE;
-}
-
-PP_WebSocketBinaryType_Dev PPB_WebSocket_Impl::GetBinaryType() {
-  switch (binary_type_) {
-    case WebSocket::BinaryTypeBlob:
-      return PP_WEBSOCKETBINARYTYPE_BLOB_DEV;
-    case WebSocket::BinaryTypeArrayBuffer:
-      return PP_WEBSOCKETBINARYTYPE_ARRAYBUFFER_DEV;
-    default:
-      NOTREACHED();
-      return PP_WEBSOCKETBINARYTYPE_INVALID;
-  }
-}
-
 void PPB_WebSocket_Impl::didConnect() {
   DCHECK_EQ(PP_WEBSOCKETREADYSTATE_CONNECTING_DEV, state_);
   state_ = PP_WEBSOCKETREADYSTATE_OPEN_DEV;
   TrackedCallback::ClearAndRun(&connect_callback_, PP_OK);
 }
 
 void PPB_WebSocket_Impl::didReceiveMessage(const WebString& message) {
   // Dispose packets after receiving an error or in invalid state.
   if (error_was_received_ || !InValidStateToReceive(state_))
     return;
@@ skipping 101 matching lines @@
 
   *receive_callback_var_ = received_messages_.front()->GetPPVar();
   received_messages_.pop();
   receive_callback_var_ = NULL;
   wait_for_receive_ = false;
   return PP_OK;
 }
 
 }  // namespace ppapi
 }  // namespace webkit