DevTools: Introduce virtual AndroidDeviceManager::Device::HttpQuery

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"
 
 namespace {
 
 const int kBufferSize = 16 * 1024;
 
+static const char kHttpGetRequest[] = "GET %s HTTP/1.1\r\n\r\n";
+
 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";
 
 class HttpRequest {
  public:
   typedef AndroidDeviceManager::CommandCallback CommandCallback;
@@ skipping 155 matching lines @@
 
 AndroidDeviceManager::DeviceInfo::~DeviceInfo() {
 }
 
 AndroidDeviceManager::Device::Device(const std::string& serial,
                                      bool is_connected)
     : serial_(serial),
       is_connected_(is_connected) {
 }
 
+void AndroidDeviceManager::Device::HttpQuery(const std::string& socket_name,
+                                             const std::string& path,
+                                             const CommandCallback& callback) {
+  std::string request(base::StringPrintf(kHttpGetRequest, path.c_str()));
+  OpenSocket(socket_name,
+             base::Bind(&HttpRequest::CommandRequest, request, callback));
+}
+
 AndroidDeviceManager::Device::~Device() {
 }
 
 AndroidDeviceManager::DeviceProvider::DeviceProvider() {
 }
 
 AndroidDeviceManager::DeviceProvider::~DeviceProvider() {
 }
 
 // static
@@ skipping 45 matching lines @@
 }
 
 void AndroidDeviceManager::HttpQuery(
     const std::string& serial,
     const std::string& socket_name,
     const std::string& request,
     const CommandCallback& callback) {
   DCHECK(CalledOnValidThread());
   Device* device = FindDevice(serial);
   if (device)
-    device->OpenSocket(socket_name,
-        base::Bind(&HttpRequest::CommandRequest, request, callback));
+    device->HttpQuery(socket_name, request, callback);
   else
     callback.Run(net::ERR_CONNECTION_FAILED, std::string());
 }
 
 void AndroidDeviceManager::HttpUpgrade(
     const std::string& serial,
     const std::string& socket_name,
     const std::string& url,
     const SocketCallback& callback) {
   DCHECK(CalledOnValidThread());
@@ skipping 51 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();
 }