WebSocket Pepper API: Implement extensions

ppapi/tests/test_websocket.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/tests/test_websocket.h"
 
 #include <string.h>
 #include <vector>
 
 #include "ppapi/c/dev/ppb_testing_dev.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/ppb_core.h"
 #include "ppapi/c/ppb_var.h"
 #include "ppapi/c/ppb_var_array_buffer.h"
 #include "ppapi/c/ppb_websocket.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/var_array_buffer.h"
 #include "ppapi/cpp/websocket.h"
 #include "ppapi/tests/test_utils.h"
 #include "ppapi/tests/testing_instance.h"
 #include "ppapi/utility/websocket/websocket_api.h"
 
 // These servers are provided by pywebsocket server side handlers in
 // LayoutTests/http/tests/websocket/tests/hybi/*_wsh.
 // pywebsocket server itself is launched in ppapi_ui_test.cc.
 const char kEchoServerURL[] =
     "ws://localhost:8880/websocket/tests/hybi/echo";

[Takashi Toyoshima, 2012/03/09 18:46:15]

This URL will be changed to ".../hybi/echo-with-no-extension".

 
 const char kCloseServerURL[] =
     "ws://localhost:8880/websocket/tests/hybi/close";
 
 const char kProtocolTestServerURL[] =
     "ws://localhost:8880/websocket/tests/hybi/protocol-test?protocol=";
 
 const char* const kInvalidURLs[] = {
   "http://www.google.com/invalid_scheme",
   "ws://www.google.com/invalid#fragment",
@@ skipping 700 matching lines @@
       PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE, pp::Var(reason), close_callback);
   ASSERT_EQ(PP_OK_COMPLETIONPENDING, result);
   result = close_callback.WaitForResult();
   ASSERT_EQ(PP_OK, result);
 
   // Check initialized properties access.
   ASSERT_EQ(0, ws.GetBufferedAmount());
   ASSERT_EQ(PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE, ws.GetCloseCode());
   ASSERT_TRUE(AreEqualWithString(ws.GetCloseReason().pp_var(), reason.c_str()));
   ASSERT_EQ(true, ws.GetCloseWasClean());
-  ASSERT_TRUE(AreEqualWithString(ws.GetExtensions().pp_var(), ""));
+  ASSERT_TRUE(AreEqualWithString(ws.GetExtensions().pp_var(),
+      "x-webkit-deflate-frame"));

[dmichael (off chromium), 2012/03/09 18:27:16]

What's the extension do? Is there a way for a PPAPI user to use the extension?

[Takashi Toyoshima, 2012/03/09 18:46:15]

Extensions is defined in RFC for WebSocket.
This mechanism is used to extend base WebSocket protocol, E.g., adding zlib
compression, multiplexing, etc.

Then, this extensions property just show which extensions are applied between
the client and the server. The client could not control which one should be
applied. This is same with JavaScript version of API. But some client want to
know which one is applied. E.g, some client may want to restrict connection
numbers when multiplexing is not applied. Thus, this interface is useful for a
PPAPI user, too.

BTW, I think this expectation depends on WebKit side implementation. This
"x-webkit-deflate-frame" will be changed to "deflate-frame" near the future. And
other extensions might be added with delimiter like "deflate-frame,mux", again.

So, yesterday I land another layout test where all extensions is disabled by
default. This WebKit change will be merged soon, and there, I keep old
expectation "" for this line. In that case, the change for this unit test is
just changing server URL like s/echo/echo-with-no-extension/.

   ASSERT_TRUE(AreEqualWithString(ws.GetProtocol().pp_var(), ""));
   ASSERT_EQ(PP_WEBSOCKETREADYSTATE_CLOSED, ws.GetReadyState());
   ASSERT_TRUE(AreEqualWithString(ws.GetURL().pp_var(), kCloseServerURL));
 
   PASS();
 }
 
 std::string TestWebSocket::TestUtilityInvalidConnect() {
   const pp::Var protocols[] = { pp::Var() };
 
@@ skipping 323 matching lines @@
   size_t last_event = events_on_closed - 1;
   for (uint32_t i = 1; i < last_event; ++i) {
     ASSERT_EQ(WebSocketEvent::EVENT_MESSAGE, events[i].event_type);
     ASSERT_TRUE(AreEqualWithString(events[i].var.pp_var(), message_char));
   }
   ASSERT_EQ(WebSocketEvent::EVENT_CLOSE, events[last_event].event_type);
   ASSERT_TRUE(events[last_event].was_clean);
 
   PASS();
 }