Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2924)

Unified Diff: chrome/browser/devtools/device/android_device_manager.cc

Issue 288353005: DevTools: Introduce virtual AndroidDeviceManager::Device::HttpQuery (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@deviceinfo2
Patch Set: Rebase better Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/devtools/device/android_device_manager.cc
diff --git a/chrome/browser/devtools/device/android_device_manager.cc b/chrome/browser/devtools/device/android_device_manager.cc
index 5dd2627122831a5a0313f2ba39e414c6e749114a..6184fe560fee2fc06495a6f00918d12742ff49ab 100644
--- a/chrome/browser/devtools/device/android_device_manager.cc
+++ b/chrome/browser/devtools/device/android_device_manager.cc
@@ -15,6 +15,8 @@ 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"
@@ -190,6 +192,14 @@ AndroidDeviceManager::Device::Device(const std::string& 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() {
}
@@ -255,8 +265,7 @@ void AndroidDeviceManager::HttpQuery(
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());
}
« no previous file with comments | « chrome/browser/devtools/device/android_device_manager.h ('k') | chrome/browser/devtools/device/devtools_android_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698