Index: webkit/plugins/ppapi/ppb_websocket_impl.h |
diff --git a/webkit/plugins/ppapi/ppb_websocket_impl.h b/webkit/plugins/ppapi/ppb_websocket_impl.h |
index bd6f6c8d6798d9bf1b72fc3bb0de2d327a3c1814..acff003666e6518dc14ecd4400d0b88356cef99e 100644 |
--- a/webkit/plugins/ppapi/ppb_websocket_impl.h |
+++ b/webkit/plugins/ppapi/ppb_websocket_impl.h |
@@ -53,11 +53,8 @@ class PPB_WebSocket_Impl : public ::ppapi::Resource, |
virtual PP_Bool GetCloseWasClean() OVERRIDE; |
virtual PP_Var GetExtensions() OVERRIDE; |
virtual PP_Var GetProtocol() OVERRIDE; |
- virtual PP_WebSocketReadyState_Dev GetReadyState() OVERRIDE; |
+ virtual PP_WebSocketReadyState GetReadyState() OVERRIDE; |
virtual PP_Var GetURL() OVERRIDE; |
- virtual PP_Bool SetBinaryType( |
- PP_WebSocketBinaryType_Dev binary_type) OVERRIDE; |
- virtual PP_WebSocketBinaryType_Dev GetBinaryType() OVERRIDE; |
// WebSocketClient implementation. |
virtual void didConnect(); |
@@ -74,8 +71,7 @@ class PPB_WebSocket_Impl : public ::ppapi::Resource, |
int32_t DoReceive(); |
scoped_ptr<WebKit::WebSocket> websocket_; |
- PP_WebSocketReadyState_Dev state_; |
- WebKit::WebSocket::BinaryType binary_type_; |
+ PP_WebSocketReadyState state_; |
bool error_was_received_; |
scoped_refptr< ::ppapi::TrackedCallback> connect_callback_; |