[DevTools] Remote JSON requests from javascript (Chromium side)

chrome/browser/devtools/devtools_targets_ui.cc

 // Copyright 2013 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/devtools_targets_ui.h"
 
 #include "base/memory/weak_ptr.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "chrome/browser/devtools/device/devtools_android_bridge.h"
 #include "chrome/browser/devtools/devtools_target_impl.h"
 #include "chrome/common/chrome_version_info.h"
 #include "content/public/browser/browser_child_process_observer.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/worker_service.h"
 #include "content/public/browser/worker_service_observer.h"
 #include "content/public/common/process_type.h"
 #include "net/base/escape.h"
+#include "net/base/net_errors.h"
 
 using content::BrowserThread;
 
 namespace {
 
 const char kTargetSourceField[]  = "source";
 const char kTargetSourceLocal[]  = "local";
 const char kTargetSourceRemote[]  = "remote";
 
 const char kTargetIdField[]  = "id";
@@ skipping 200 matching lines @@
       &LocalTargetsUIHandler::SendTargets,
       weak_factory_.GetWeakPtr()));
 }
 
 void LocalTargetsUIHandler::SendTargets(
     const DevToolsTargetImpl::List& targets) {
   base::ListValue list_value;
   std::map<std::string, base::DictionaryValue*> id_to_descriptor;
 
   STLDeleteValues(&targets_);
-  for (DevToolsTargetImpl::List::const_iterator it = targets.begin();
-      it != targets.end(); ++it) {
-    DevToolsTargetImpl* target = *it;
+  for (DevToolsTargetImpl* target : targets) {
     targets_[target->GetId()] = target;
     id_to_descriptor[target->GetId()] = Serialize(*target);
   }
 
-  for (TargetMap::iterator it(targets_.begin()); it != targets_.end(); ++it) {
-    DevToolsTargetImpl* target = it->second;
+  for (const auto& pair : targets_) {
+    DevToolsTargetImpl* target = pair.second;
     base::DictionaryValue* descriptor = id_to_descriptor[target->GetId()];
     std::string parent_id = target->GetParentId();
     if (parent_id.empty() || id_to_descriptor.count(parent_id) == 0) {
       list_value.Append(descriptor);
     } else {
       base::DictionaryValue* parent = id_to_descriptor[parent_id];
-      base::ListValue* guests = NULL;
+      base::ListValue* guests = nullptr;
       if (!parent->GetList(kGuestList, &guests)) {
         guests = new base::ListValue();
         parent->Set(kGuestList, guests);
       }
       guests->Append(descriptor);
     }
   }
 
   SendSerializedTargets(list_value);
 }
 
 // AdbTargetsUIHandler --------------------------------------------------------
 
 class AdbTargetsUIHandler
     : public DevToolsTargetsUIHandler,
       public DevToolsAndroidBridge::DeviceListListener {
  public:
   AdbTargetsUIHandler(const Callback& callback, Profile* profile);
   ~AdbTargetsUIHandler() override;
 
   void Open(const std::string& browser_id,
             const std::string& url,
             const DevToolsTargetsUIHandler::TargetCallback&) override;
 
   scoped_refptr<content::DevToolsAgentHost> GetBrowserAgentHost(
       const std::string& browser_id) override;
 
+  void SendJsonRequest(const std::string& browser_id,
+                       const std::string& url,
+                       const JsonCallback& callback) override;
+
  private:
   // DevToolsAndroidBridge::Listener overrides.
   void DeviceListChanged(
       const DevToolsAndroidBridge::RemoteDevices& devices) override;
 
   DevToolsAndroidBridge* GetAndroidBridge();
 
   Profile* const profile_;
   DevToolsAndroidBridge* const android_bridge_;
 
@@ skipping 35 matching lines @@
       it->second,
       url,
       base::Bind(&CallOnTarget, callback, android_bridge_));
 }
 
 scoped_refptr<content::DevToolsAgentHost>
 AdbTargetsUIHandler::GetBrowserAgentHost(
     const std::string& browser_id) {
   RemoteBrowsers::iterator it = remote_browsers_.find(browser_id);
   if (it == remote_browsers_.end())
-    return NULL;
+    return nullptr;
 
   return android_bridge_->GetBrowserAgentHost(it->second);
 }
 
+void AdbTargetsUIHandler::SendJsonRequest(const std::string& browser_id,
+                                          const std::string& url,
+                                          const JsonCallback& callback) {
+  RemoteBrowsers::iterator it = remote_browsers_.find(browser_id);
+  if (it == remote_browsers_.end()) {
+    callback.Run(net::ERR_FAILED, std::string());
+  } else {
+    android_bridge_->SendJsonRequest(it->second, url, callback);
+  }
+}
+
 void AdbTargetsUIHandler::DeviceListChanged(
     const DevToolsAndroidBridge::RemoteDevices& devices) {
   remote_browsers_.clear();
   STLDeleteValues(&targets_);
 
   base::ListValue device_list;
-  for (DevToolsAndroidBridge::RemoteDevices::const_iterator dit =
-      devices.begin(); dit != devices.end(); ++dit) {
-    DevToolsAndroidBridge::RemoteDevice* device = dit->get();
+  for (const auto& device : devices) {
     base::DictionaryValue* device_data = new base::DictionaryValue();
     device_data->SetString(kAdbModelField, device->model());
     device_data->SetString(kAdbSerialField, device->serial());
     device_data->SetBoolean(kAdbConnectedField, device->is_connected());
     std::string device_id = base::StringPrintf(
         kAdbDeviceIdFormat,
         device->serial().c_str());
     device_data->SetString(kTargetIdField, device_id);
     base::ListValue* browser_list = new base::ListValue();
     device_data->Set(kAdbBrowsersList, browser_list);
 
     DevToolsAndroidBridge::RemoteBrowsers& browsers = device->browsers();
-    for (DevToolsAndroidBridge::RemoteBrowsers::iterator bit =
-        browsers.begin(); bit != browsers.end(); ++bit) {
-      DevToolsAndroidBridge::RemoteBrowser* browser = bit->get();
+    for (const auto& browser : browsers) {
       base::DictionaryValue* browser_data = new base::DictionaryValue();
       browser_data->SetString(kAdbBrowserNameField, browser->display_name());
       browser_data->SetString(kAdbBrowserUserField, browser->user());
       browser_data->SetString(kAdbBrowserVersionField, browser->version());
       DevToolsAndroidBridge::RemoteBrowser::ParsedVersion parsed =
           browser->GetParsedVersion();
       browser_data->SetInteger(
           kAdbBrowserChromeVersionField,
           browser->IsChrome() && !parsed.empty() ? parsed[0] : 0);
       std::string browser_id = SerializeBrowserId(browser);
@@ skipping 64 matching lines @@
 scoped_ptr<DevToolsTargetsUIHandler>
 DevToolsTargetsUIHandler::CreateForAdb(
     const DevToolsTargetsUIHandler::Callback& callback, Profile* profile) {
   return scoped_ptr<DevToolsTargetsUIHandler>(
       new AdbTargetsUIHandler(callback, profile));
 }
 
 DevToolsTargetImpl* DevToolsTargetsUIHandler::GetTarget(
     const std::string& target_id) {
   TargetMap::iterator it = targets_.find(target_id);
-  if (it != targets_.end())
-    return it->second;
-  return NULL;
+  return it == targets_.end() ? nullptr : it->second;
 }
 
 void DevToolsTargetsUIHandler::Open(const std::string& browser_id,
                                     const std::string& url,
                                     const TargetCallback& callback) {
-  callback.Run(NULL);
+  callback.Run(nullptr);
 }
 
 scoped_refptr<content::DevToolsAgentHost>
 DevToolsTargetsUIHandler::GetBrowserAgentHost(const std::string& browser_id) {
-  return NULL;
+  return nullptr;
+}
+
+void DevToolsTargetsUIHandler::SendJsonRequest(const std::string& browser_id,
+                                               const std::string& url,
+                                               const JsonCallback& callback) {
+  callback.Run(net::ERR_FAILED, std::string());
 }
 
 base::DictionaryValue* DevToolsTargetsUIHandler::Serialize(
     const DevToolsTargetImpl& target) {
   base::DictionaryValue* target_data = new base::DictionaryValue();
   target_data->SetString(kTargetSourceField, source_id_);
   target_data->SetString(kTargetIdField, target.GetId());
   target_data->SetString(kTargetTypeField, target.GetType());
   target_data->SetBoolean(kAttachedField, target.IsAttached());
   target_data->SetString(kUrlField, target.GetURL().spec());
@@ skipping 26 matching lines @@
 PortForwardingStatusSerializer::~PortForwardingStatusSerializer() {
   DevToolsAndroidBridge* android_bridge =
       DevToolsAndroidBridge::Factory::GetForProfile(profile_);
   if (android_bridge)
     android_bridge->RemovePortForwardingListener(this);
 }
 
 void PortForwardingStatusSerializer::PortStatusChanged(
     const ForwardingStatus& status) {
   base::DictionaryValue result;
-  for (ForwardingStatus::const_iterator sit = status.begin();
-      sit != status.end(); ++sit) {
+  for (const auto& device_status : status) {
     base::DictionaryValue* port_status_dict = new base::DictionaryValue();
-    const PortStatusMap& port_status_map = sit->second;
-    for (PortStatusMap::const_iterator it = port_status_map.begin();
-         it != port_status_map.end(); ++it) {
+    for (const auto& port_status : device_status.second) {
       port_status_dict->SetInteger(
-          base::StringPrintf("%d", it->first), it->second);
+          base::StringPrintf("%d", port_status.first), port_status.second);
     }
 
     base::DictionaryValue* device_status_dict = new base::DictionaryValue();
     device_status_dict->Set(kPortForwardingPorts, port_status_dict);
     device_status_dict->SetString(kPortForwardingBrowserId,
-                                  SerializeBrowserId(sit->first));
+                                  SerializeBrowserId(device_status.first));
 
     std::string device_id = base::StringPrintf(
         kAdbDeviceIdFormat,
-        sit->first->serial().c_str());
+        device_status.first->serial().c_str());
     result.Set(device_id, device_status_dict);
   }
   callback_.Run(result);
 }