DevTools: Extract ADB specific requests from DevToolsAndroidBridge into a separate class.

chrome/browser/devtools/device/android_device_manager.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/android_device_manager.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/socket/stream_socket.h"
 
-using content::BrowserThread;
-
 namespace {
 
 const int kBufferSize = 16 * 1024;
 
 static const char kWebSocketUpgradeRequest[] = "GET %s HTTP/1.1\r\n"
     "Upgrade: WebSocket\r\n"
     "Connection: Upgrade\r\n"
     "Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
     "Sec-WebSocket-Version: 13\r\n"
     "\r\n";
@@ skipping 143 matching lines @@
 
   scoped_ptr<net::StreamSocket> socket_;
   std::string response_;
   AndroidDeviceManager::CommandCallback command_callback_;
   AndroidDeviceManager::SocketCallback socket_callback_;
   size_t body_pos_;
 };
 
 } // namespace
 
+AndroidDeviceManager::BrowserInfo::BrowserInfo()
+    : type(kTypeOther) {
+}
+
+AndroidDeviceManager::DeviceInfo::DeviceInfo() {
+}
+
+AndroidDeviceManager::DeviceInfo::~DeviceInfo() {
+}
+
 AndroidDeviceManager::Device::Device(const std::string& serial,
                                      bool is_connected)
     : serial_(serial),
       is_connected_(is_connected) {
 }
 
 AndroidDeviceManager::Device::~Device() {
 }
 
 AndroidDeviceManager::DeviceProvider::DeviceProvider() {
@@ skipping 21 matching lines @@
   stopped_ = true;
   devices_.clear();
 }
 
 bool AndroidDeviceManager::IsConnected(const std::string& serial) {
   DCHECK(CalledOnValidThread());
   Device* device = FindDevice(serial);
   return device && device->is_connected();
 }
 
-void AndroidDeviceManager::RunCommand(
-    const std::string& serial,
-    const std::string& command,
-    const CommandCallback& callback) {
+void AndroidDeviceManager::QueryDeviceInfo(const std::string& serial,
+                                           const DeviceInfoCallback& callback) {
   DCHECK(CalledOnValidThread());
   Device* device = FindDevice(serial);
   if (device)
-    device->RunCommand(command, callback);
+    device->QueryDeviceInfo(callback);
   else
-    callback.Run(net::ERR_CONNECTION_FAILED, std::string());
+    callback.Run(DeviceInfo());
 }
 
 void AndroidDeviceManager::OpenSocket(
     const std::string& serial,
     const std::string& socket_name,
     const SocketCallback& callback) {
   DCHECK(CalledOnValidThread());
   Device* device = FindDevice(serial);
   if (device)
     device->OpenSocket(socket_name, callback);
@@ skipping 75 matching lines @@
 }
 
 AndroidDeviceManager::Device*
 AndroidDeviceManager::FindDevice(const std::string& serial) {
   DCHECK(CalledOnValidThread());
   DeviceMap::const_iterator it = devices_.find(serial);
   if (it == devices_.end())
     return NULL;
   return (*it).second.get();
 }