Move Blink dependency out of plugin proxy code.

ppapi/proxy/websocket_resource.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/proxy/websocket_resource.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/proxy/dispatch_reply_message.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/shared_impl/var_tracker.h"
-#include "third_party/WebKit/public/web/WebSocket.h"
 
 namespace {
 
 const uint32_t kMaxReasonSizeInBytes = 123;
 const size_t kBaseFramingOverhead = 2;
 const size_t kMaskingKeyLength = 4;
 const size_t kMinimumPayloadSizeWithTwoByteExtendedPayloadLength = 126;
 const size_t kMinimumPayloadSizeWithEightByteExtendedPayloadLength = 0x10000;
 
 uint64_t SaturateAdd(uint64_t a, uint64_t b) {
@@ skipping 101 matching lines @@
                                  const PP_Var& reason,
                                  scoped_refptr<TrackedCallback> callback) {
   if (TrackedCallback::IsPending(close_callback_))
     return PP_ERROR_INPROGRESS;
   if (state_ == PP_WEBSOCKETREADYSTATE_INVALID)
     return PP_ERROR_FAILED;
 
   // Validate |code| and |reason|.
   scoped_refptr<StringVar> reason_string_var;
   std::string reason_string;
-  blink::WebSocket::CloseEventCode event_code =
-      static_cast<blink::WebSocket::CloseEventCode>(code);
-  if (code == PP_WEBSOCKETSTATUSCODE_NOT_SPECIFIED) {
-    // PP_WEBSOCKETSTATUSCODE_NOT_SPECIFIED and CloseEventCodeNotSpecified are
-    // assigned to different values. A conversion is needed if
-    // PP_WEBSOCKETSTATUSCODE_NOT_SPECIFIED is specified.
-    event_code = blink::WebSocket::CloseEventCodeNotSpecified;
-  } else {
-    if (!(code == PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE ||
-        (PP_WEBSOCKETSTATUSCODE_USER_REGISTERED_MIN <= code &&
-        code <= PP_WEBSOCKETSTATUSCODE_USER_PRIVATE_MAX)))
+  if (code != PP_WEBSOCKETSTATUSCODE_NOT_SPECIFIED) {
+    if ((code != PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE &&

[dmichael (off chromium), 2014/03/18 18:02:30]

nit: I think you have an extra set of enclosing parens

[bbudge, 2014/03/18 20:23:31]

Done.

+        (PP_WEBSOCKETSTATUSCODE_USER_REGISTERED_MIN > code ||

[dmichael (off chromium), 2014/03/18 18:02:30]

nit: now that you negated this, I think it would be more readable to reverse
these:
code < PP_WEBSOCKETSTATUSCODE_USER_REGISTERED_MIN

[bbudge, 2014/03/18 20:23:31]

Done. (Just reversed the first, is that what you meant?)

[dmichael (off chromium), 2014/03/18 20:38:53]

Yes, that's exactly what I meant, thanks!

+        code > PP_WEBSOCKETSTATUSCODE_USER_PRIVATE_MAX)))
       // RFC 6455 limits applications to use reserved connection close code in
       // section 7.4.2.. The WebSocket API (http://www.w3.org/TR/websockets/)
       // defines this out of range error as InvalidAccessError in JavaScript.
       return PP_ERROR_NOACCESS;
 
     // |reason| must be ignored if it is PP_VARTYPE_UNDEFINED or |code| is
     // PP_WEBSOCKETSTATUSCODE_NOT_SPECIFIED.
     if (reason.type != PP_VARTYPE_UNDEFINED) {
       // Validate |reason|.
       reason_string_var = StringVar::FromPPVar(reason);
@@ skipping 27 matching lines @@
   // Abort ongoing receive.
   if (TrackedCallback::IsPending(receive_callback_)) {
     receive_callback_var_ = NULL;
     // Need to do a "Post" to avoid reentering the plugin.
     receive_callback_->PostAbort();
     receive_callback_ = NULL;
   }
 
   // Close connection.
   state_ = PP_WEBSOCKETREADYSTATE_CLOSING;
-  PpapiHostMsg_WebSocket_Close msg(static_cast<int32_t>(event_code),
+  PpapiHostMsg_WebSocket_Close msg(static_cast<int32_t>(code),
                                    reason_string);
   Call<PpapiPluginMsg_WebSocket_CloseReply>(RENDERER, msg,
       base::Bind(&WebSocketResource::OnPluginMsgCloseReply, this));
   return PP_OK_COMPLETIONPENDING;
 }
 
 int32_t WebSocketResource::ReceiveMessage(
     PP_Var* message,
     scoped_refptr<TrackedCallback> callback) {
   if (TrackedCallback::IsPending(receive_callback_))
@@ skipping 276 matching lines @@
     return PP_OK;
 
   *receive_callback_var_ = received_messages_.front()->GetPPVar();
   received_messages_.pop();
   receive_callback_var_ = NULL;
   return PP_OK;
 }
 
 }  // namespace proxy
 }  // namespace ppapi