Revert of DevTools: Made id unique across different remote browsers

chrome/browser/devtools/device/devtools_android_bridge.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_android_bridge.h"
 
 #include <map>
 #include <vector>
 
 #include "base/base64.h"
@@ skipping 293 matching lines @@
   content::DevToolsExternalAgentProxy* proxy_;
   DISALLOW_COPY_AND_ASSIGN(AgentHostDelegate);
 };
 
 // static
 scoped_refptr<content::DevToolsAgentHost>
 AgentHostDelegate::GetOrCreateAgentHost(
     const std::string& id,
     scoped_refptr<DevToolsAndroidBridge::RemoteBrowser> browser,
     const std::string& debug_url) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  AgentHostDelegates::iterator it = g_host_delegates.Get().find(id);
-  if (it != g_host_delegates.Get().end())
-    return it->second->agent_host_;
+   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+   AgentHostDelegates::iterator it = g_host_delegates.Get().find(id);
+   if (it != g_host_delegates.Get().end())
+     return it->second->agent_host_;
 
   AgentHostDelegate* delegate = new AgentHostDelegate(id, browser, debug_url);
   scoped_refptr<content::DevToolsAgentHost> result =
       content::DevToolsAgentHost::Create(delegate);
   delegate->agent_host_ = result.get();
   return result;
 }
 
 AgentHostDelegate::AgentHostDelegate(
     const std::string& id,
@@ skipping 80 matching lines @@
   virtual void Reload() const OVERRIDE;
 
   void Navigate(const std::string& url, base::Closure callback) const;
 
  private:
   scoped_refptr<DevToolsAndroidBridge::RemoteBrowser> browser_;
   std::string debug_url_;
   std::string frontend_url_;
   std::string remote_id_;
   std::string remote_type_;
-  std::string local_id_;
   DISALLOW_COPY_AND_ASSIGN(RemotePageTarget);
 };
 
 static std::string GetStringProperty(const base::DictionaryValue& value,
                                      const std::string& name) {
   std::string result;
   value.GetString(name, &result);
   return result;
 }
 
@@ skipping 16 matching lines @@
 
 RemotePageTarget::RemotePageTarget(
     scoped_refptr<DevToolsAndroidBridge::RemoteBrowser> browser,
     const base::DictionaryValue& value)
     : DevToolsTargetImpl(AgentHostDelegate::GetOrCreateAgentHost(
                              BuildUniqueTargetId(browser.get(), value),
                              browser, GetDebugURL(value))),
       browser_(browser),
       debug_url_(GetDebugURL(value)),
       remote_id_(GetStringProperty(value, "id")),
-      remote_type_(GetStringProperty(value, "type")),
-      local_id_(BuildUniqueTargetId(browser.get(), value)) {
+      remote_type_(GetStringProperty(value, "type")) {
   set_type("adb_page");
   set_url(GURL(GetStringProperty(value, "url")));
   set_title(base::UTF16ToUTF8(net::UnescapeForHTML(base::UTF8ToUTF16(
       GetStringProperty(value, "title")))));
   set_description(GetStringProperty(value, "description"));
   set_favicon_url(GURL(GetStringProperty(value, "faviconUrl")));
   debug_url_ = GetDebugURL(value);
   frontend_url_ = GetStringProperty(value, "devtoolsFrontendUrl");
 
   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);
 }
 
 RemotePageTarget::~RemotePageTarget() {
 }
 
 DevToolsTargetImpl* RemotePageTarget::GetTarget() {
   return this;
 }
 
 std::string RemotePageTarget::GetFrontendURL() {
   return frontend_url_;
 }
 
 std::string RemotePageTarget::GetId() const {
-  return local_id_;
+  return remote_id_;
 }
 
 bool RemotePageTarget::IsAttached() const {
   return debug_url_.empty();
 }
 
 static void NoOp(int, const std::string&) {}
 
 void RemotePageTarget::Inspect(Profile* profile) const {
   Activate();
@@ skipping 436 matching lines @@
   bool enabled;
   if (pref_value->GetAsBoolean(&enabled) && enabled) {
     device_providers.push_back(new UsbDeviceProvider(profile_));
   }
   device_manager_->SetDeviceProviders(device_providers);
   if (NeedsDeviceListPolling()) {
     StopDeviceListPolling();
     StartDeviceListPolling();
   }
 }