| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/devtools/device/tcp_device_provider.h" | 5 #include "chrome/browser/devtools/device/tcp_device_provider.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> |
| 8 | 9 |
| 9 #include "base/location.h" | 10 #include "base/location.h" |
| 10 #include "base/single_thread_task_runner.h" | 11 #include "base/single_thread_task_runner.h" |
| 11 #include "base/strings/string_number_conversions.h" | 12 #include "base/strings/string_number_conversions.h" |
| 12 #include "base/strings/stringprintf.h" | 13 #include "base/strings/stringprintf.h" |
| 13 #include "base/thread_task_runner_handle.h" | 14 #include "base/thread_task_runner_handle.h" |
| 14 #include "chrome/browser/devtools/device/adb/adb_client_socket.h" | 15 #include "chrome/browser/devtools/device/adb/adb_client_socket.h" |
| 15 #include "net/base/net_errors.h" | 16 #include "net/base/net_errors.h" |
| 16 #include "net/dns/host_resolver.h" | 17 #include "net/dns/host_resolver.h" |
| 17 #include "net/socket/tcp_client_socket.h" | 18 #include "net/socket/tcp_client_socket.h" |
| 18 | 19 |
| 19 namespace { | 20 namespace { |
| 20 | 21 |
| 21 const char kDeviceModel[] = "Remote Target"; | 22 const char kDeviceModel[] = "Remote Target"; |
| 22 const char kBrowserName[] = "Target"; | 23 const char kBrowserName[] = "Target"; |
| 23 | 24 |
| 24 static void RunSocketCallback( | 25 static void RunSocketCallback( |
| 25 const AndroidDeviceManager::SocketCallback& callback, | 26 const AndroidDeviceManager::SocketCallback& callback, |
| 26 scoped_ptr<net::StreamSocket> socket, | 27 scoped_ptr<net::StreamSocket> socket, |
| 27 int result) { | 28 int result) { |
| 28 callback.Run(result, socket.Pass()); | 29 callback.Run(result, std::move(socket)); |
| 29 } | 30 } |
| 30 | 31 |
| 31 class ResolveHostAndOpenSocket final { | 32 class ResolveHostAndOpenSocket final { |
| 32 public: | 33 public: |
| 33 ResolveHostAndOpenSocket(const net::HostPortPair& address, | 34 ResolveHostAndOpenSocket(const net::HostPortPair& address, |
| 34 const AdbClientSocket::SocketCallback& callback) | 35 const AdbClientSocket::SocketCallback& callback) |
| 35 : callback_(callback) { | 36 : callback_(callback) { |
| 36 host_resolver_ = net::HostResolver::CreateDefaultResolver(nullptr); | 37 host_resolver_ = net::HostResolver::CreateDefaultResolver(nullptr); |
| 37 net::HostResolver::RequestInfo request_info(address); | 38 net::HostResolver::RequestInfo request_info(address); |
| 38 int result = host_resolver_->Resolve( | 39 int result = host_resolver_->Resolve( |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 release_callback_.Run(); | 125 release_callback_.Run(); |
| 125 } | 126 } |
| 126 | 127 |
| 127 void TCPDeviceProvider::set_release_callback_for_test( | 128 void TCPDeviceProvider::set_release_callback_for_test( |
| 128 const base::Closure& callback) { | 129 const base::Closure& callback) { |
| 129 release_callback_ = callback; | 130 release_callback_ = callback; |
| 130 } | 131 } |
| 131 | 132 |
| 132 TCPDeviceProvider::~TCPDeviceProvider() { | 133 TCPDeviceProvider::~TCPDeviceProvider() { |
| 133 } | 134 } |
| OLD | NEW |