Revert of DevTools: Removed refcounting from AndroidWebSocket

chrome/browser/devtools/device/self_device_provider.cc

 // Copyright 2014 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 "chrome/browser/devtools/device/self_device_provider.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "net/socket/tcp_client_socket.h"
 
 namespace {
 
 const char kDeviceModel[] = "Local Chrome";
 const char kBrowserName[] = "Chrome";
 const char kLocalhost[] = "127.0.0.1";
 const char kSerial[] = "local";
 
 static void RunSocketCallback(
     const AndroidDeviceManager::SocketCallback& callback,
-    scoped_ptr<net::StreamSocket> socket,
+    net::StreamSocket* socket,
     int result) {
-  callback.Run(result, socket.Pass());
+  callback.Run(result, socket);
 }
 
 }  // namespace
 
 SelfAsDeviceProvider::SelfAsDeviceProvider(int port) : port_(port) {
 }
 
 void SelfAsDeviceProvider::QueryDevices(const SerialsCallback& callback) {
   std::vector<std::string> result;
   result.push_back(kSerial);
@@ skipping 21 matching lines @@
                                       const std::string& socket_name,
                                       const SocketCallback& callback) {
   // Use plain socket for remote debugging and port forwarding on Desktop
   // (debugging purposes).
   net::IPAddressNumber ip_number;
   net::ParseIPLiteralToNumber(kLocalhost, &ip_number);
   int port;
   base::StringToInt(socket_name, &port);
   net::AddressList address_list =
       net::AddressList::CreateFromIPAddress(ip_number, port);
-  scoped_ptr<net::StreamSocket> socket(new net::TCPClientSocket(
-      address_list, NULL, net::NetLog::Source()));
-  socket->Connect(
-      base::Bind(&RunSocketCallback, callback, base::Passed(&socket)));
+  net::TCPClientSocket* socket = new net::TCPClientSocket(
+      address_list, NULL, net::NetLog::Source());
+  socket->Connect(base::Bind(&RunSocketCallback, callback, socket));
 }