WebSocket Pepper API: allow to close connection without code and reason

ppapi/tests/test_websocket.cc

Index: ppapi/tests/test_websocket.cc
diff --git a/ppapi/tests/test_websocket.cc b/ppapi/tests/test_websocket.cc
index 30926551b0c8992183ad1dca85c81681e74b3ab9..73811d1f2ea3ea9d99c7c3c50dc3bfe14ad6b663 100644
--- a/ppapi/tests/test_websocket.cc
+++ b/ppapi/tests/test_websocket.cc
@@ -549,7 +549,16 @@ std::string TestWebSocket::TestValidClose() {
   callback.WaitForResult(websocket_interface_->Close(
       ws, PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE, reason,
       callback.GetCallback().pp_completion_callback()));
-  CHECK_CALLBACK_BEHAVIOR(callback);

[Takashi Toyoshima, 2012/05/14 12:05:04]

I'm afraid that these checks will not work in the future.

[dmichael (off chromium), 2012/05/14 16:10:49]

Can you elaborate on your concerns?

The check simply ensures that the callback followed expected PPAPI callback
behavior. I.e.:
- If the callback type is REQUIRED, and the PPAPI function happens
synchronously, that's an error.
- If the callback type is blocking, and the PPAPI function happens
asynchronously, that's an error.

The CHECK_CALLBACK_BEHAVIOR is safe. If it ever fails, it means you (or I) have
a bug. That said, we don't *have* to use it everywhere.

[Takashi Toyoshima, 2012/05/15 10:55:28]

Sorry, I misunderstood on CHECK_CALLBACK_BEHAVIOR macro as it always checked
callback being invoked asynchronously.
OK, I keep these macro here and around.

+  ASSERT_EQ(PP_OK, callback.result());
+  core_interface_->ReleaseResource(ws);
+
+  // Close without code and reason.
+  ws = Connect(GetFullURL(kEchoServerURL), &result, "");
+  ASSERT_TRUE(ws);
+  ASSERT_EQ(PP_OK, result);
+  callback.WaitForResult(websocket_interface_->Close(
+      ws, PP_WEBSOCKETSTATUSCODE_NOT_SPECIFIED, reason,
+      callback.GetCallback().pp_completion_callback()));
   ASSERT_EQ(PP_OK, callback.result());
   core_interface_->ReleaseResource(ws);
 
@@ -560,7 +569,6 @@ std::string TestWebSocket::TestValidClose() {
   callback.WaitForResult(websocket_interface_->Close(
       ws, PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE, PP_MakeUndefined(),
       callback.GetCallback().pp_completion_callback()));
-  CHECK_CALLBACK_BEHAVIOR(callback);
   ASSERT_EQ(PP_OK, callback.result());
   core_interface_->ReleaseResource(ws);
 
@@ -1016,7 +1024,6 @@ std::string TestWebSocket::TestCcInterfaces() {
       instance_->pp_instance(), callback_type());
   connect_callback.WaitForResult(ws.Connect(
       pp::Var(GetFullURL(kCloseServerURL)), NULL, 0U, connect_callback));
-  CHECK_CALLBACK_BEHAVIOR(connect_callback);
   ASSERT_EQ(PP_OK, connect_callback.result());
 
   std::string text_message("hello C++");