WebSocket Pepper API: the second Close() should not return error code.

The WebSocket API defines that call to Close() on CLOSED state must do nothing
and cause no error. Currently Pepper API returns PP_ERROR_INPROGRESS. This
error code is confusing. We should return PP_OK here.

BUG=124866
TEST=browser_tests --gtest_filter='*WebSocket*'


Review URL: http://codereview.chromium.org/10169036

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133894 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 25 insertions, 0 deletions

diff --git a/ppapi/tests/test_websocket.cc b/ppapi/tests/test_websocket.cc
index eff333a..11a4260 100644
--- a/ppapi/tests/test_websocket.cc
+++ b/ppapi/tests/test_websocket.cc
@@ -502,6 +502,31 @@ std::string TestWebSocket::TestInvalidClose() {
   ReleaseVar(receive_message_var);
   core_interface_->ReleaseResource(ws);
 
+  // Close twice.
+  ws = Connect(GetFullURL(kEchoServerURL), &result, "");
+  ASSERT_TRUE(ws);
+  ASSERT_EQ(PP_OK, result);
+  result = websocket_interface_->Close(ws,
+      PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE, reason,
+      callback.GetCallback().pp_completion_callback());
+  ASSERT_EQ(PP_OK_COMPLETIONPENDING, result);
+  // Call another Close() before previous one is in progress.
+  result = websocket_interface_->Close(ws,
+      PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE, reason,
+      another_callback.GetCallback().pp_completion_callback());
+  ASSERT_EQ(PP_ERROR_INPROGRESS, result);
+  result = callback.WaitForResult();
+  ASSERT_EQ(PP_OK, result);
+  // Call another Close() after previous one is completed.
+  // This Close() must do nothing and reports no error.
+  result = websocket_interface_->Close(ws,
+      PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE, reason,
+      callback.GetCallback().pp_completion_callback());
+  if (result == PP_OK_COMPLETIONPENDING)
+    result = callback.WaitForResult();
+  ASSERT_EQ(PP_OK, result);
+  core_interface_->ReleaseResource(ws);
+
   ReleaseVar(reason);
 
   PASS();