Revert of DevTools: Removed refcounting from AndroidWebSocket

chrome/browser/devtools/device/adb/adb_client_socket.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/adb/adb_client_socket.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/socket/tcp_client_socket.h"
 
 namespace {
 
 const int kBufferSize = 16 * 1024;
 const char kOkayResponse[] = "OKAY";
 const char kHostTransportCommand[] = "host:transport:%s";
 const char kLocalhost[] = "127.0.0.1";
 
+typedef base::Callback<void(int, const std::string&)> CommandCallback;
+typedef base::Callback<void(int, net::StreamSocket*)> SocketCallback;
+
 std::string EncodeMessage(const std::string& message) {
   static const char kHexChars[] = "0123456789ABCDEF";
 
   size_t length = message.length();
   std::string result(4, '\0');
   char b = reinterpret_cast<const char*>(&length)[1];
   result[0] = kHexChars[(b >> 4) & 0xf];
   result[1] = kHexChars[b & 0xf];
   b = reinterpret_cast<const char*>(&length)[0];
   result[2] = kHexChars[(b >> 4) & 0xf];
@@ skipping 30 matching lines @@
     if (!CheckNetResultOrDie(result))
       return;
     SendCommand(socket_name_, true,
                 base::Bind(&AdbTransportSocket::OnSocketAvailable,
                            base::Unretained(this)));
   }
 
   void OnSocketAvailable(int result, const std::string& response) {
     if (!CheckNetResultOrDie(result))
       return;
-    callback_.Run(net::OK, socket_.Pass());
+    callback_.Run(net::OK, socket_.release());
     delete this;
   }
 
   bool CheckNetResultOrDie(int result) {
     if (result >= 0)
       return true;
-    callback_.Run(result, make_scoped_ptr<net::StreamSocket>(NULL));
+    callback_.Run(result, NULL);
     delete this;
     return false;
   }
 
   std::string serial_;
   std::string socket_name_;
   SocketCallback callback_;
 };
 
 class AdbQuerySocket : AdbClientSocket {
@@ skipping 193 matching lines @@
                                     base::Unretained(this),
                                     callback,
                                     new_response,
                                     response_buffer,
                                     bytes_left));
   if (result > 0)
     OnResponseData(callback, new_response, response_buffer, bytes_left, result);
   else if (result != net::ERR_IO_PENDING)
     callback.Run(net::OK, new_response);
 }