WebSocket Pepper API: Implement extensions

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 2eb7af465f65d37b727626ca7afb41bb5f53ab8f..7d8f9a050590f8fc1cb41726388f01505c6cfa0d 100644
--- a/ppapi/tests/test_websocket.cc
+++ b/ppapi/tests/test_websocket.cc
@@ -27,7 +27,7 @@
 // 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";
+    "ws://localhost:8880/websocket/tests/hybi/echo-with-no-extension";
 
 const char kCloseServerURL[] =
     "ws://localhost:8880/websocket/tests/hybi/close";
@@ -416,6 +416,8 @@ std::string TestWebSocket::TestValidConnect() {
   PP_Resource ws = Connect(kEchoServerURL, &result, NULL);
   ASSERT_TRUE(ws);
   ASSERT_EQ(PP_OK, result);
+  PP_Var extensions = websocket_interface_->GetExtensions(ws);
+  ASSERT_TRUE(AreEqualWithString(extensions, ""));
   core_interface_->ReleaseResource(ws);
 
   PASS();
@@ -748,7 +750,6 @@ std::string TestWebSocket::TestCcInterfaces() {
   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(), ""));

[Takashi Toyoshima, 2012/03/09 19:26:43]

CcInterfaces test doesn't use kEchoServer, so I move this initialized extension
property check to TestValidConnect for C API, and to TestUtilityValidConnect for
C++ API.

   ASSERT_TRUE(AreEqualWithString(ws.GetProtocol().pp_var(), ""));
   ASSERT_EQ(PP_WEBSOCKETREADYSTATE_CLOSED, ws.GetReadyState());
   ASSERT_TRUE(AreEqualWithString(ws.GetURL().pp_var(), kCloseServerURL));
@@ -837,6 +838,7 @@ std::string TestWebSocket::TestUtilityValidConnect() {
   const std::vector<WebSocketEvent>& events = websocket.GetSeenEvents();
   ASSERT_EQ(1U, events.size());
   ASSERT_EQ(WebSocketEvent::EVENT_OPEN, events[0].event_type);
+  ASSERT_TRUE(AreEqualWithString(websocket.GetExtensions().pp_var(), ""));
 
   PASS();
 }