Index: chrome/browser/devtools/device/adb/adb_client_socket.cc |
diff --git a/chrome/browser/devtools/device/adb/adb_client_socket.cc b/chrome/browser/devtools/device/adb/adb_client_socket.cc |
index 0845f92de9ed61ac2b8ba1a7b476c4e4e6a71e56..41b3c9bed471fec8df79856ee034c20ebdd4fc84 100644 |
--- a/chrome/browser/devtools/device/adb/adb_client_socket.cc |
+++ b/chrome/browser/devtools/device/adb/adb_client_socket.cc |
@@ -20,9 +20,6 @@ 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"; |
@@ -73,14 +70,14 @@ class AdbTransportSocket : public AdbClientSocket { |
void OnSocketAvailable(int result, const std::string& response) { |
if (!CheckNetResultOrDie(result)) |
return; |
- callback_.Run(net::OK, socket_.release()); |
+ callback_.Run(net::OK, socket_.Pass()); |
delete this; |
} |
bool CheckNetResultOrDie(int result) { |
if (result >= 0) |
return true; |
- callback_.Run(result, NULL); |
+ callback_.Run(result, make_scoped_ptr<net::StreamSocket>(NULL)); |
delete this; |
return false; |
} |