Remove linked_ptr from SpdyStream.

Review URL: https://chromiumcodereview.appspot.com/10784055

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

15 files changed, 52 insertions, 49 deletions

diff --git a/net/spdy/spdy_http_stream.cc b/net/spdy/spdy_http_stream.cc
index dce5f13..1f79e64 100644
--- a/net/spdy/spdy_http_stream.cc
+++ b/net/spdy/spdy_http_stream.cc
@@ -194,11 +194,11 @@ int SpdyHttpStream::SendRequest(const HttpRequestHeaders& request_headers,
 
   stream_->SetDelegate(this);
 
-  linked_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock);
+  scoped_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock);
   CreateSpdyHeadersFromHttpRequest(*request_info_, request_headers,
                                    headers.get(), stream_->GetProtocolVersion(),
                                    direct_);
-  stream_->set_spdy_headers(headers);
+  stream_->set_spdy_headers(headers.Pass());
 
   stream_->SetRequestTime(request_time);
   // This should only get called in the case of a request occurring
diff --git a/net/spdy/spdy_http_stream_spdy2_unittest.cc b/net/spdy/spdy_http_stream_spdy2_unittest.cc
index 397fe1d..e78c8d7 100644
--- a/net/spdy/spdy_http_stream_spdy2_unittest.cc
+++ b/net/spdy/spdy_http_stream_spdy2_unittest.cc
@@ -361,11 +361,10 @@ TEST_F(SpdyHttpStreamSpdy2Test, SpdyURLTest) {
             http_stream->SendRequest(headers, scoped_ptr<UploadDataStream>(),
                                      &response, callback.callback()));
 
-  SpdyHeaderBlock* spdy_header =
-    http_stream->stream()->spdy_headers().get();
-  EXPECT_TRUE(spdy_header != NULL);
-  if (spdy_header->find("url") != spdy_header->end())
-    EXPECT_EQ("/foo?query=what", spdy_header->find("url")->second);
+  const SpdyHeaderBlock& spdy_header =
+    http_stream->stream()->spdy_headers();
+  if (spdy_header.find("url") != spdy_header.end())
+    EXPECT_EQ("/foo?query=what", spdy_header.find("url")->second);
   else
     FAIL() << "No url is set in spdy_header!";
 
diff --git a/net/spdy/spdy_http_stream_spdy3_unittest.cc b/net/spdy/spdy_http_stream_spdy3_unittest.cc
index 21a2f62..f5e4b99 100644
--- a/net/spdy/spdy_http_stream_spdy3_unittest.cc
+++ b/net/spdy/spdy_http_stream_spdy3_unittest.cc
@@ -494,11 +494,10 @@ TEST_F(SpdyHttpStreamSpdy3Test, SpdyURLTest) {
             http_stream->SendRequest(headers, scoped_ptr<UploadDataStream>(),
                                      &response, callback.callback()));
 
-  SpdyHeaderBlock* spdy_header =
-    http_stream->stream()->spdy_headers().get();
-  EXPECT_TRUE(spdy_header != NULL);
-  if (spdy_header->find(":path") != spdy_header->end())
-    EXPECT_EQ("/foo?query=what", spdy_header->find(":path")->second);
+  const SpdyHeaderBlock& spdy_header =
+    http_stream->stream()->spdy_headers();
+  if (spdy_header.find(":path") != spdy_header.end())
+    EXPECT_EQ("/foo?query=what", spdy_header.find(":path")->second);
   else
     FAIL() << "No url is set in spdy_header!";
 
diff --git a/net/spdy/spdy_proxy_client_socket.cc b/net/spdy/spdy_proxy_client_socket.cc
index b3ab28f..759c84cf 100644
--- a/net/spdy/spdy_proxy_client_socket.cc
+++ b/net/spdy/spdy_proxy_client_socket.cc
@@ -372,7 +372,7 @@ int SpdyProxyClientSocket::DoSendRequest() {
                  &request_line));
 
   request_.extra_headers.MergeFrom(request_headers);
-  linked_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock());
+  scoped_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock());
   CreateSpdyHeadersFromHttpRequest(request_, request_headers, headers.get(),
                                    spdy_stream_->GetProtocolVersion(), true);
   // Reset the URL to be the endpoint of the connection
@@ -383,7 +383,7 @@ int SpdyProxyClientSocket::DoSendRequest() {
     (*headers)["url"] = endpoint_.ToString();
     headers->erase("scheme");
   }
-  spdy_stream_->set_spdy_headers(headers);
+  spdy_stream_->set_spdy_headers(headers.Pass());
 
   return spdy_stream_->SendRequest(true);
 }
diff --git a/net/spdy/spdy_session_spdy2_unittest.cc b/net/spdy/spdy_session_spdy2_unittest.cc
index 1f44220..a884854f 100644
--- a/net/spdy/spdy_session_spdy2_unittest.cc
+++ b/net/spdy/spdy_session_spdy2_unittest.cc
@@ -1181,16 +1181,19 @@ TEST_F(SpdySessionSpdy2Test, OutOfOrderSynStreams) {
                                       BoundNetLog(), callback2.callback()));
   EXPECT_EQ(3u, spdy_stream2->stream_id());
 
-  linked_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock);
+  scoped_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock);
   (*headers)["method"] = "GET";
   (*headers)["scheme"] = url1.scheme();
   (*headers)["host"] = url1.host();
   (*headers)["url"] = url1.path();
   (*headers)["version"] = "HTTP/1.1";
-  spdy_stream1->set_spdy_headers(headers);
+  scoped_ptr<SpdyHeaderBlock> headers2(new SpdyHeaderBlock);
+  *headers2 = *headers;
+
+  spdy_stream1->set_spdy_headers(headers.Pass());
   EXPECT_TRUE(spdy_stream1->HasUrl());
 
-  spdy_stream2->set_spdy_headers(headers);
+  spdy_stream2->set_spdy_headers(headers2.Pass());
   EXPECT_TRUE(spdy_stream2->HasUrl());
 
   spdy_stream1->SendRequest(false);
diff --git a/net/spdy/spdy_session_spdy3_unittest.cc b/net/spdy/spdy_session_spdy3_unittest.cc
index 68a5de5..2d8d969 100644
--- a/net/spdy/spdy_session_spdy3_unittest.cc
+++ b/net/spdy/spdy_session_spdy3_unittest.cc
@@ -1344,16 +1344,19 @@ TEST_F(SpdySessionSpdy3Test, OutOfOrderSynStreams) {
                                       BoundNetLog(), callback2.callback()));
   EXPECT_EQ(3u, spdy_stream2->stream_id());
 
-  linked_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock);
+  scoped_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock);
   (*headers)[":method"] = "GET";
   (*headers)[":scheme"] = url1.scheme();
   (*headers)[":host"] = url1.host();
   (*headers)[":path"] = url1.path();
   (*headers)[":version"] = "HTTP/1.1";
-  spdy_stream1->set_spdy_headers(headers);
+  scoped_ptr<SpdyHeaderBlock> headers2(new SpdyHeaderBlock);
+  *headers2 = *headers;
+
+  spdy_stream1->set_spdy_headers(headers.Pass());
   EXPECT_TRUE(spdy_stream1->HasUrl());
 
-  spdy_stream2->set_spdy_headers(headers);
+  spdy_stream2->set_spdy_headers(headers2.Pass());
   EXPECT_TRUE(spdy_stream2->HasUrl());
 
   spdy_stream1->SendRequest(false);
diff --git a/net/spdy/spdy_stream.cc b/net/spdy/spdy_stream.cc
index 2b85a27..4fe3436 100644
--- a/net/spdy/spdy_stream.cc
+++ b/net/spdy/spdy_stream.cc
@@ -133,13 +133,13 @@ void SpdyStream::DetachDelegate() {
     Cancel();
 }
 
-const linked_ptr<SpdyHeaderBlock>& SpdyStream::spdy_headers() const {
-  return request_;
+const SpdyHeaderBlock& SpdyStream::spdy_headers() const {
+  DCHECK(request_ != NULL);
+  return *request_.get();
 }
 
-void SpdyStream::set_spdy_headers(
-    const linked_ptr<SpdyHeaderBlock>& headers) {
-  request_ = headers;
+void SpdyStream::set_spdy_headers(scoped_ptr<SpdyHeaderBlock> headers) {
+  request_.reset(headers.release());
 }
 
 void SpdyStream::set_initial_recv_window_size(int32 window_size) {
diff --git a/net/spdy/spdy_stream.h b/net/spdy/spdy_stream.h
index 80d9e50..1c6625b 100644
--- a/net/spdy/spdy_stream.h
+++ b/net/spdy/spdy_stream.h
@@ -9,8 +9,8 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/bandwidth_metrics.h"
 #include "net/base/io_buffer.h"
@@ -170,8 +170,8 @@ class NET_EXPORT_PRIVATE SpdyStream
 
   const BoundNetLog& net_log() const { return net_log_; }
 
-  const linked_ptr<SpdyHeaderBlock>& spdy_headers() const;
-  void set_spdy_headers(const linked_ptr<SpdyHeaderBlock>& headers);
+  const SpdyHeaderBlock& spdy_headers() const;
+  void set_spdy_headers(scoped_ptr<SpdyHeaderBlock> headers);
   base::Time GetRequestTime() const;
   void SetRequestTime(base::Time t);
 
@@ -325,13 +325,13 @@ class NET_EXPORT_PRIVATE SpdyStream
   SpdyStream::Delegate* delegate_;
 
   // The request to send.
-  linked_ptr<SpdyHeaderBlock> request_;
+  scoped_ptr<SpdyHeaderBlock> request_;
 
   // The time at which the request was made that resulted in this response.
   // For cached responses, this time could be "far" in the past.
   base::Time request_time_;
 
-  linked_ptr<SpdyHeaderBlock> response_;
+  scoped_ptr<SpdyHeaderBlock> response_;
   base::Time response_time_;
 
   State io_state_;
diff --git a/net/spdy/spdy_stream_spdy2_unittest.cc b/net/spdy/spdy_stream_spdy2_unittest.cc
index c9b09e6..cbc4071 100644
--- a/net/spdy/spdy_stream_spdy2_unittest.cc
+++ b/net/spdy/spdy_stream_spdy2_unittest.cc
@@ -218,13 +218,13 @@ TEST_F(SpdyStreamSpdy2Test, SendDataAfterOpen) {
 
   EXPECT_FALSE(stream->HasUrl());
 
-  linked_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock);
+  scoped_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock);
   (*headers)["method"] = "GET";
   (*headers)["scheme"] = url.scheme();
   (*headers)["host"] = url.host();
   (*headers)["url"] = url.path();
   (*headers)["version"] = "HTTP/1.1";
-  stream->set_spdy_headers(headers);
+  stream->set_spdy_headers(headers.Pass());
   EXPECT_TRUE(stream->HasUrl());
   EXPECT_EQ(kStreamUrl, stream->GetUrl().spec());
 
@@ -394,13 +394,13 @@ TEST_F(SpdyStreamSpdy2Test, StreamError) {
 
   EXPECT_FALSE(stream->HasUrl());
 
-  linked_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock);
+  scoped_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock);
   (*headers)["method"] = "GET";
   (*headers)["scheme"] = url.scheme();
   (*headers)["host"] = url.host();
   (*headers)["url"] = url.path();
   (*headers)["version"] = "HTTP/1.1";
-  stream->set_spdy_headers(headers);
+  stream->set_spdy_headers(headers.Pass());
   EXPECT_TRUE(stream->HasUrl());
   EXPECT_EQ(kStreamUrl, stream->GetUrl().spec());
 
diff --git a/net/spdy/spdy_stream_spdy3_unittest.cc b/net/spdy/spdy_stream_spdy3_unittest.cc
index f941651..a59ce808 100644
--- a/net/spdy/spdy_stream_spdy3_unittest.cc
+++ b/net/spdy/spdy_stream_spdy3_unittest.cc
@@ -219,13 +219,13 @@ TEST_F(SpdyStreamSpdy3Test, SendDataAfterOpen) {
 
   EXPECT_FALSE(stream->HasUrl());
 
-  linked_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock);
+  scoped_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock);
   (*headers)[":method"] = "GET";
   (*headers)[":scheme"] = url.scheme();
   (*headers)[":host"] = url.host();
   (*headers)[":path"] = url.path();
   (*headers)[":version"] = "HTTP/1.1";
-  stream->set_spdy_headers(headers);
+  stream->set_spdy_headers(headers.Pass());
   EXPECT_TRUE(stream->HasUrl());
   EXPECT_EQ(kStreamUrl, stream->GetUrl().spec());
 
@@ -399,13 +399,13 @@ TEST_F(SpdyStreamSpdy3Test, StreamError) {
 
   EXPECT_FALSE(stream->HasUrl());
 
-  linked_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock);
+  scoped_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock);
   (*headers)[":method"] = "GET";
   (*headers)[":scheme"] = url.scheme();
   (*headers)[":host"] = url.host();
   (*headers)[":path"] = url.path();
   (*headers)[":version"] = "HTTP/1.1";
-  stream->set_spdy_headers(headers);
+  stream->set_spdy_headers(headers.Pass());
   EXPECT_TRUE(stream->HasUrl());
   EXPECT_EQ(kStreamUrl, stream->GetUrl().spec());
 
diff --git a/net/spdy/spdy_websocket_stream.cc b/net/spdy/spdy_websocket_stream.cc
index 5a9a541..7ceb829 100644
--- a/net/spdy/spdy_websocket_stream.cc
+++ b/net/spdy/spdy_websocket_stream.cc
@@ -54,13 +54,12 @@ int SpdyWebSocketStream::InitializeStream(const GURL& url,
   return result;
 }
 
-int SpdyWebSocketStream::SendRequest(
-    const linked_ptr<SpdyHeaderBlock>& headers) {
+int SpdyWebSocketStream::SendRequest(scoped_ptr<SpdyHeaderBlock> headers) {
   if (!stream_) {
     NOTREACHED();
     return ERR_UNEXPECTED;
   }
-  stream_->set_spdy_headers(headers);
+  stream_->set_spdy_headers(headers.Pass());
   int result = stream_->SendRequest(true);
   if (result < OK && result != ERR_IO_PENDING)
     Close();
diff --git a/net/spdy/spdy_websocket_stream.h b/net/spdy/spdy_websocket_stream.h
index 2ac0e5c..4adb37c 100644
--- a/net/spdy/spdy_websocket_stream.h
+++ b/net/spdy/spdy_websocket_stream.h
@@ -7,8 +7,8 @@
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
-#include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "net/base/completion_callback.h"
 #include "net/base/request_priority.h"
@@ -66,7 +66,7 @@ class NET_EXPORT_PRIVATE SpdyWebSocketStream
                        RequestPriority request_priority,
                        const BoundNetLog& stream_net_log);
 
-  int SendRequest(const linked_ptr<SpdyHeaderBlock>& headers);
+  int SendRequest(scoped_ptr<SpdyHeaderBlock> headers);
   int SendData(const char* data, int length);
   void Close();
 
diff --git a/net/spdy/spdy_websocket_stream_spdy2_unittest.cc b/net/spdy/spdy_websocket_stream_spdy2_unittest.cc
index 5f468c9..99264e1 100644
--- a/net/spdy/spdy_websocket_stream_spdy2_unittest.cc
+++ b/net/spdy/spdy_websocket_stream_spdy2_unittest.cc
@@ -281,11 +281,11 @@ class SpdyWebSocketStreamSpdy2Test : public testing::Test {
     return session_->InitializeWithSocket(connection.release(), false, OK);
   }
   void SendRequest() {
-    linked_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock);
+    scoped_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock);
     (*headers)["url"] = "ws://example.com/echo";
     (*headers)["origin"] = "http://example.com/wsdemo";
 
-    websocket_stream_->SendRequest(headers);
+    websocket_stream_->SendRequest(headers.Pass());
   }
 
   SpdySettingsIds spdy_settings_id_to_set_;
diff --git a/net/spdy/spdy_websocket_stream_spdy3_unittest.cc b/net/spdy/spdy_websocket_stream_spdy3_unittest.cc
index 5a21e66..c6e1717 100644
--- a/net/spdy/spdy_websocket_stream_spdy3_unittest.cc
+++ b/net/spdy/spdy_websocket_stream_spdy3_unittest.cc
@@ -281,11 +281,11 @@ class SpdyWebSocketStreamSpdy3Test : public testing::Test {
     return session_->InitializeWithSocket(connection.release(), false, OK);
   }
   void SendRequest() {
-    linked_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock);
+    scoped_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock);
     (*headers)["url"] = "ws://example.com/echo";
     (*headers)["origin"] = "http://example.com/wsdemo";
 
-    websocket_stream_->SendRequest(headers);
+    websocket_stream_->SendRequest(headers.Pass());
   }
 
   SpdySettingsIds spdy_settings_id_to_set_;
diff --git a/net/websockets/websocket_job.cc b/net/websockets/websocket_job.cc
index 61798333..56faefb 100644
--- a/net/websockets/websocket_job.cc
+++ b/net/websockets/websocket_job.cc
@@ -387,10 +387,10 @@ void WebSocketJob::LoadCookieCallback(const std::string& cookie) {
 
 void WebSocketJob::DoSendData() {
   if (spdy_websocket_stream_.get()) {
-    linked_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock);
+    scoped_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock);
     handshake_request_->GetRequestHeaderBlock(
         socket_->url(), headers.get(), &challenge_);
-    spdy_websocket_stream_->SendRequest(headers);
+    spdy_websocket_stream_->SendRequest(headers.Pass());
   } else {
     const std::string& handshake_request =
         handshake_request_->GetRawRequest();