Add construction of WebSocketDeflateStream

net/websockets/websocket_test_util.cc

 // Copyright 2013 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 "net/websockets/websocket_test_util.h"
 
 #include "base/basictypes.h"
 #include "base/strings/stringprintf.h"
 #include "net/socket/socket_test_util.h"
 
@@ skipping 26 matching lines @@
       "GET %s HTTP/1.1\r\n"
       "Host: localhost\r\n"
       "Connection: Upgrade\r\n"
       "Upgrade: websocket\r\n"
       "Origin: %s\r\n"
       "Sec-WebSocket-Version: 13\r\n"
       "User-Agent:\r\n"
       "Accept-Encoding: gzip,deflate\r\n"
       "Accept-Language: en-us,fr\r\n"
       "Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
+      "Sec-WebSocket-Extensions: permessage-deflate; client_max_window_bits\r\n"
       "%s\r\n",
       path.c_str(),
       origin.c_str(),
       extra_headers.c_str());
 }
 
 std::string WebSocketStandardResponse(const std::string& extra_headers) {
   return base::StringPrintf(
       "HTTP/1.1 101 Switching Protocols\r\n"
       "Upgrade: websocket\r\n"
@@ skipping 23 matching lines @@
 WebSocketDeterministicMockClientSocketFactoryMaker::factory() {
   return &detail_->factory;
 }
 
 void WebSocketDeterministicMockClientSocketFactoryMaker::SetExpectations(
     const std::string& expect_written,
     const std::string& return_to_read) {
   // We need to extend the lifetime of these strings.
   detail_->expect_written = expect_written;
   detail_->return_to_read = return_to_read;
-  detail_->write = MockWrite(SYNCHRONOUS, 0, detail_->expect_written.c_str());
-  detail_->read = MockRead(SYNCHRONOUS, 1, detail_->return_to_read.c_str());
+  detail_->write = MockWrite(SYNCHRONOUS,
+                             detail_->expect_written.data(),
+                             detail_->expect_written.size(),
+                             0);
+  detail_->read = MockRead(SYNCHRONOUS,
+                           detail_->return_to_read.data(),
+                           detail_->return_to_read.size(),
+                           1);
   scoped_ptr<DeterministicSocketData> socket_data(
       new DeterministicSocketData(&detail_->read, 1, &detail_->write, 1));
   socket_data->set_connect_data(MockConnect(SYNCHRONOUS, OK));
   socket_data->SetStop(2);
   SetRawExpectations(socket_data.Pass());
 }
 
 void WebSocketDeterministicMockClientSocketFactoryMaker::SetRawExpectations(
     scoped_ptr<DeterministicSocketData> socket_data) {
   detail_->data = socket_data.Pass();
@@ skipping 14 matching lines @@
 
 TestURLRequestContext*
 WebSocketTestURLRequestContextHost::GetURLRequestContext() {
   url_request_context_.Init();
   // A Network Delegate is required to make the URLRequest::Delegate work.
   url_request_context_.set_network_delegate(&network_delegate_);
   return &url_request_context_;
 }
 
 }  // namespace net