Update net/ to use scoped_refptr<T>::get() rather than implicit "operator T*"

net/spdy/spdy_session_spdy2_unittest.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 "net/spdy/spdy_session.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ip_endpoint.h"
@@ skipping 318 matching lines @@
 
   // Give the session a SPDY2 framer.
   session->buffered_spdy_framer_.reset(new BufferedSpdyFramer(SPDY2, false));
 
   // Create the associated stream and add to active streams.
   scoped_ptr<SpdyHeaderBlock> request_headers(new SpdyHeaderBlock);
   (*request_headers)["scheme"] = "http";
   (*request_headers)["host"] = "www.google.com";
   (*request_headers)["url"] = "/";
 
-  scoped_ptr<SpdyStream> stream(
-      new SpdyStream(SPDY_REQUEST_RESPONSE_STREAM,
-                     session, std::string(), DEFAULT_PRIORITY,
-                     kSpdyStreamInitialWindowSize,
-                     kSpdyStreamInitialWindowSize,
-                     session->net_log_));
+  scoped_ptr<SpdyStream> stream(new SpdyStream(SPDY_REQUEST_RESPONSE_STREAM,
+                                               session.get(),
+                                               std::string(),
+                                               DEFAULT_PRIORITY,
+                                               kSpdyStreamInitialWindowSize,
+                                               kSpdyStreamInitialWindowSize,
+                                               session->net_log_));
   stream->SendRequestHeaders(request_headers.Pass(), NO_MORE_DATA_TO_SEND);
   SpdyStream* stream_ptr = stream.get();
   session->InsertCreatedStream(stream.Pass());
   stream = session->ActivateCreatedStream(stream_ptr);
   session->InsertActivatedStream(stream.Pass());
 
   SpdyHeaderBlock headers;
   headers["url"] = "http://www.google.com/a.dat";
   session->OnSynStream(2, 1, 0, 0, true, false, headers);
 
@@ skipping 567 matching lines @@
   HostPortPair test_host_port_pair(test_hosts[0].name, kTestPort);
 
   // Initialize session for the first host.
   scoped_refptr<TransportSocketParams> transport_params(
       new TransportSocketParams(test_host_port_pair,
                                 MEDIUM,
                                 false,
                                 false,
                                 OnHostResolutionCallback()));
   IPPoolingInitializedSession(test_host_port_pair.ToString(),
-                              transport_params, http_session, session);
+                              transport_params,
+                              http_session.get(),
+                              session.get());
 
   // TODO(rtenneti): MockClientSocket::GetPeerAddress return's 0 as the port
   // number. Fix it to return port 80 and then use GetPeerAddress to AddAlias.
   SpdySessionPoolPeer pool_peer(spdy_session_pool);
   pool_peer.AddAlias(test_hosts[0].addresses.front(), test_hosts[0].key);
 
   // Flush the SpdySession::OnReadComplete() task.
   base::MessageLoop::current()->RunUntilIdle();
 
   // The third host has no overlap with the first, so it can't pool IPs.
@@ skipping 16 matching lines @@
       spdy_session_pool->Get(test_hosts[2].key, BoundNetLog());
 
   // Verify that we have sessions for everything.
   EXPECT_TRUE(spdy_session_pool->HasSession(test_hosts[0].key));
   EXPECT_TRUE(spdy_session_pool->HasSession(test_hosts[1].key));
   EXPECT_TRUE(spdy_session_pool->HasSession(test_hosts[2].key));
 
   // Initialize session for host 2.
   session_deps.socket_factory->AddSocketDataProvider(&data);
   IPPoolingInitializedSession(test_hosts[2].key.host_port_pair().ToString(),
-                              transport_params, http_session, session2);
+                              transport_params,
+                              http_session.get(),
+                              session2.get());
 
   // Grab the session to host 1 and verify that it is the same session
   // we got with host 0, and that is a different than host 2's session.
   scoped_refptr<SpdySession> session1 =
       spdy_session_pool->Get(test_hosts[1].key, BoundNetLog());
   EXPECT_EQ(session.get(), session1.get());
   EXPECT_NE(session2.get(), session1.get());
 
   // Initialize session for host 1.
   session_deps.socket_factory->AddSocketDataProvider(&data);
   IPPoolingInitializedSession(test_hosts[2].key.host_port_pair().ToString(),
-                              transport_params, http_session, session2);
+                              transport_params,
+                              http_session.get(),
+                              session2.get());
 
   // Remove the aliases and observe that we still have a session for host1.
   pool_peer.RemoveAliases(test_hosts[0].key);
   pool_peer.RemoveAliases(test_hosts[1].key);
   EXPECT_TRUE(spdy_session_pool->HasSession(test_hosts[1].key));
 
   // Expire the host cache
   session_deps.host_resolver->GetHostCache()->clear();
   EXPECT_TRUE(spdy_session_pool->HasSession(test_hosts[1].key));
 
@@ skipping 1490 matching lines @@
   // Cancelling the request should still not release the session's socket,
   // since the session is still kept alive by the SpdySessionPool.
   ASSERT_TRUE(spdy_stream1.get());
   spdy_stream1->Cancel();
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(pool->IsStalled());
   EXPECT_FALSE(callback2.have_result());
 }
 
 }  // namespace net