Fixed not working inspector in case of Remote Target

chrome/browser/devtools/device/devtools_device_discovery.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/devtools_device_discovery.h"
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 234 matching lines @@
       remote_id_(value ? GetStringProperty(value, "id") : ""),
       frontend_url_(value ? GetFrontendURLFromValue(value) : ""),
       title_(value ? base::UTF16ToUTF8(net::UnescapeForHTML(base::UTF8ToUTF16(
           GetStringProperty(value, "title")))) : ""),
       description_(value ? GetStringProperty(value, "description") : ""),
       url_(GURL(value ? GetStringProperty(value, "url") : "")),
       favicon_url_(GURL(value ? GetStringProperty(value, "faviconUrl") : "")),
       socket_opened_(false),
       agent_host_(nullptr),
       proxy_(nullptr) {
+    if (!GURL(frontend_url_).has_scheme() && value) {
+        frontend_url_ = GetStringProperty(value, "Proxy-devtoolsFrontendUrl");
+    }
 }
 
 AgentHostDelegate::~AgentHostDelegate() {
 }
 
 void AgentHostDelegate::Attach(content::DevToolsExternalAgentProxy* proxy) {
   proxy_ = proxy;
   content::RecordAction(
       base::StartsWith(browser_id_, kWebViewSocketPrefix,
                        base::CompareCase::SENSITIVE)
@@ skipping 186 matching lines @@
   if (value && value->GetAsDictionary(&dict)) {
     std::string browser_name;
     if (dict->GetString("Browser", &browser_name)) {
       std::vector<std::string> parts = base::SplitString(
           browser_name, "/", base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
       if (parts.size() == 2)
         browser->version_ = parts[1];
       else
         browser->version_ = browser_name;
     }
+    std::string webkit_version;
+    if (dict->GetString("WebKit-Version", &webkit_version)) {
+      browser->webkit_version_ = webkit_version;
+    }
     std::string package;
     if (dict->GetString("Android-Package", &package)) {
       browser->display_name_ =
           AndroidDeviceManager::GetBrowserName(browser->socket(), package);
     }
   }
 }
 
 void DevToolsDeviceDiscovery::DiscoveryRequest::ReceivedPages(
     scoped_refptr<AndroidDeviceManager::Device> device,
     scoped_refptr<RemoteBrowser> browser,
     int result,
     const std::string& response) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (result < 0)
     return;
   std::unique_ptr<base::Value> value = base::JSONReader::Read(response);
   base::ListValue* list_value;
   if (value && value->GetAsList(&list_value)) {
     for (const auto& page_value : *list_value) {
       base::DictionaryValue* dict;
-      if (page_value->GetAsDictionary(&dict))
+      if (page_value->GetAsDictionary(&dict)) {
+        const char kFrontEndURL[] =
+          "http://chrome-devtools-frontend.appspot.com/serve_rev/%s/inspector.html";
+        dict->SetString("Proxy-devtoolsFrontendUrl",
+          base::StringPrintf(kFrontEndURL, browser->WebKitRevision().c_str()));
         browser->pages_.push_back(
             new RemotePage(device, browser->browser_id_, *dict));
+      }
     }
   }
 }
 
 // DevToolsDeviceDiscovery::RemotePage ----------------------------------------
 
 DevToolsDeviceDiscovery::RemotePage::RemotePage(
     scoped_refptr<AndroidDeviceManager::Device> device,
     const std::string& browser_id,
     const base::DictionaryValue& dict)
@@ skipping 43 matching lines @@
   for (const base::StringPiece& part :
        base::SplitStringPiece(
            version_, ".", base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY)) {
     int value = 0;
     base::StringToInt(part, &value);
     result.push_back(value);
   }
   return result;
 }
 
+std::string DevToolsDeviceDiscovery::RemoteBrowser::WebKitRevision() {
+  std::string webkit_revision;
+  size_t l = webkit_version_.find('@');
+  size_t r = webkit_version_.rfind(')');
+  if (l != std::string::npos && r != std::string::npos && r > l)
+    webkit_revision = webkit_version_.substr(l, r-l);
+  return webkit_revision;
+}
+
 DevToolsDeviceDiscovery::RemoteBrowser::~RemoteBrowser() {
 }
 
 // DevToolsDeviceDiscovery::RemoteDevice --------------------------------------
 
 DevToolsDeviceDiscovery::RemoteDevice::RemoteDevice(
     const std::string& serial,
     const AndroidDeviceManager::DeviceInfo& device_info)
     : serial_(serial),
       model_(device_info.model),
@@ skipping 54 matching lines @@
 }
 
 void DevToolsDeviceDiscovery::ReceivedDeviceList(
     const CompleteDevices& complete_devices) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   task_scheduler_.Run(base::Bind(&DevToolsDeviceDiscovery::RequestDeviceList,
                                  weak_factory_.GetWeakPtr()));
   // |callback_| should be run last as it may destroy |this|.
   callback_.Run(complete_devices);
 }