DevTools: Generate correct id for a remote target

chrome/browser/devtools/devtools_adb_bridge.cc

 // Copyright (c) 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_adb_bridge.h"
 
 #include <map>
 #include <vector>
 
 #include "base/base64.h"
@@ skipping 828 matching lines @@
   // DevToolsTargetImpl overrides:
   virtual void Inspect(Profile* profile) const OVERRIDE;
   virtual void Reload() const OVERRIDE;
 
   void Navigate(const std::string& url) const;
 
  private:
   scoped_refptr<DevToolsAdbBridge::RemoteBrowser> browser_;
   std::string debug_url_;
   std::string frontend_url_;
-  std::string agent_id_;
+  std::string remote_id_;
   DISALLOW_COPY_AND_ASSIGN(RemotePageTarget);
 };
 
 RemotePageTarget::RemotePageTarget(
     scoped_refptr<DevToolsAdbBridge::RemoteBrowser> browser,
     const base::DictionaryValue& value)
     : browser_(browser) {
   type_ = "adb_page";
-  value.GetString("id", &id_);
+  value.GetString("id", &remote_id_);
   std::string url;
   value.GetString("url", &url);
   url_ = GURL(url);
   value.GetString("title", &title_);
   title_ = base::UTF16ToUTF8(net::UnescapeForHTML(base::UTF8ToUTF16(title_)));
   value.GetString("description", &description_);
   std::string favicon_url;
   value.GetString("faviconUrl", &favicon_url);
   favicon_url_ = GURL(favicon_url);
   value.GetString("webSocketDebuggerUrl", &debug_url_);
   value.GetString("devtoolsFrontendUrl", &frontend_url_);
 
-  if (id_.empty() && !debug_url_.empty())  {
+  if (remote_id_.empty() && !debug_url_.empty())  {
     // Target id is not available until Chrome 26. Use page id at the end of
     // debug_url_ instead. For attached targets the id will remain empty.
     std::vector<std::string> parts;
     Tokenize(debug_url_, "/", &parts);
-    id_ = parts[parts.size()-1];
+    remote_id_ = parts[parts.size()-1];
   }
 
   if (debug_url_.find("ws://") == 0)
     debug_url_ = debug_url_.substr(5);
   else
     debug_url_ = "";
 
   size_t ws_param = frontend_url_.find("?ws");
   if (ws_param != std::string::npos)
     frontend_url_ = frontend_url_.substr(0, ws_param);
   if (frontend_url_.find("http:") == 0)
     frontend_url_ = "https:" + frontend_url_.substr(5);
 
-  agent_id_ = base::StringPrintf("%s:%s:%s",
+  id_ = base::StringPrintf("%s:%s:%s",
       browser_->device()->serial().c_str(),
       browser_->socket().c_str(),
-      id_.c_str());
+      remote_id_.c_str());
 }
 
 RemotePageTarget::~RemotePageTarget() {
 }
 
 bool RemotePageTarget::IsAttached() const {
   return debug_url_.empty();
 }
 
 void RemotePageTarget::Inspect(Profile* profile) const {
-  std::string request = base::StringPrintf(kActivatePageRequest, id_.c_str());
+  std::string request = base::StringPrintf(kActivatePageRequest,
+                                           remote_id_.c_str());
   base::Closure inspect_callback = base::Bind(&AgentHostDelegate::Create,
       id_, browser_, debug_url_, frontend_url_, profile);

[dgozman, 2014/01/29 15:07:16]

Just to be sure: AgentHostDelegate should know about global id, right?

   browser_->SendJsonRequest(request, inspect_callback);
 }
 
 bool RemotePageTarget::Activate() const {
-  std::string request = base::StringPrintf(kActivatePageRequest, id_.c_str());
+  std::string request = base::StringPrintf(kActivatePageRequest,
+                                           remote_id_.c_str());
   browser_->SendJsonRequest(request, base::Closure());
   return true;
 }
 
 bool RemotePageTarget::Close() const {
   if (IsAttached())
     return false;
-  std::string request = base::StringPrintf(kClosePageRequest, id_.c_str());
+  std::string request = base::StringPrintf(kClosePageRequest,
+                                           remote_id_.c_str());
   browser_->SendJsonRequest(request, base::Closure());
   return true;
 }
 
 void RemotePageTarget::Reload() const {
   browser_->SendProtocolCommand(debug_url_, kPageReloadCommand, NULL);
 }
 
 void RemotePageTarget::Navigate(const std::string& url) const {
   base::DictionaryValue params;
@@ skipping 212 matching lines @@
 
   if (listeners_.empty())
     return;
 
   BrowserThread::PostDelayedTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&DevToolsAdbBridge::RequestRemoteDevices, this),
       base::TimeDelta::FromMilliseconds(kAdbPollingIntervalMs));
 }