Fixes to socket_test_util.cc.

net/spdy/spdy_websocket_stream_unittest.cc

 // Copyright (c) 2011 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/spdy/spdy_websocket_stream.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 141 matching lines @@
   StreamEventCallback on_sent_data_;
   StreamEventCallback on_received_data_;
   StreamEventCallback on_close_;
   CompletionCallback callback_;
 
   DISALLOW_COPY_AND_ASSIGN(SpdyWebSocketStreamEventRecorder);
 };
 
 class SpdyWebSocketStreamTest : public testing::Test {
  public:
-  OrderedSocketData* data() { return data_; }
+  OrderedSocketData* data() { return data_.get(); }
 
   void DoSendHelloFrame(SpdyWebSocketStreamEvent* event) {
     websocket_stream_->SendData(kMessageFrame, kMessageFrameLength);
   }
 
   void DoSendClosingFrame(SpdyWebSocketStreamEvent* event) {
     websocket_stream_->SendData(kClosingFrame, kClosingFrameLength);
   }
 
   void DoClose(SpdyWebSocketStreamEvent* event) {
@@ skipping 72 matching lines @@
 
     closing_frame_.reset(ConstructSpdyWebSocketDataFrame(
         kClosingFrame,
         kClosingFrameLength,
         stream_id_,
         false));
   }
   int InitSession(MockRead* reads, size_t reads_count,
                   MockWrite* writes, size_t writes_count,
                   bool throttling) {
-    data_ = new OrderedSocketData(reads, reads_count, writes, writes_count);
+    data_.reset(new OrderedSocketData(reads, reads_count,
+                                      writes, writes_count));
     session_deps_.socket_factory->AddSocketDataProvider(data_.get());
     http_session_ = SpdySessionDependencies::SpdyCreateSession(&session_deps_);
     SpdySessionPool* spdy_session_pool(http_session_->spdy_session_pool());
 
     if (throttling) {
       // Set max concurrent streams to 1.
       spdy_session_pool->http_server_properties()->SetSpdySettings(
           host_port_pair_, spdy_settings_to_set_);
     }
 
@@ skipping 16 matching lines @@
     linked_ptr<spdy::SpdyHeaderBlock> headers(new spdy::SpdyHeaderBlock);
     (*headers)["url"] = "ws://example.com/echo";
     (*headers)["origin"] = "http://example.com/wsdemo";
 
     websocket_stream_->SendRequest(headers);
   }
 
   spdy::SpdySettings spdy_settings_to_set_;
   spdy::SpdySettings spdy_settings_to_send_;
   SpdySessionDependencies session_deps_;
-  scoped_refptr<OrderedSocketData> data_;
+  scoped_ptr<OrderedSocketData> data_;
   scoped_refptr<HttpNetworkSession> http_session_;
   scoped_refptr<SpdySession> session_;
   scoped_refptr<TransportSocketParams> transport_params_;
   scoped_ptr<SpdyWebSocketStream> websocket_stream_;
   spdy::SpdyStreamId stream_id_;
   scoped_ptr<spdy::SpdyFrame> request_frame_;
   scoped_ptr<spdy::SpdyFrame> response_frame_;
   scoped_ptr<spdy::SpdyFrame> message_frame_;
   scoped_ptr<spdy::SpdyFrame> closing_frame_;
   HostPortPair host_port_pair_;
@@ skipping 306 matching lines @@
   EXPECT_EQ(OK, events[7].result);
 
   // EOF close SPDY session.
   EXPECT_TRUE(!http_session_->spdy_session_pool()->HasSession(
       host_port_proxy_pair_));
   EXPECT_TRUE(data()->at_read_eof());
   EXPECT_TRUE(data()->at_write_eof());
 }
 
 }  // namespace net