DevTools: RemoteDevice and RemoteBrowser are now value types

chrome/browser/devtools/devtools_targets_ui.cc

Index: chrome/browser/devtools/devtools_targets_ui.cc
diff --git a/chrome/browser/devtools/devtools_targets_ui.cc b/chrome/browser/devtools/devtools_targets_ui.cc
index e5d96c9705e72ac0415e6a10fa869546483ab8ce..e12b0b5bb7cb824fb2db9da7199ce1004eb3335b 100644
--- a/chrome/browser/devtools/devtools_targets_ui.cc
+++ b/chrome/browser/devtools/devtools_targets_ui.cc
@@ -315,15 +315,25 @@ void AdbTargetsUIHandler::Open(
     const std::string& url,
     const DevToolsTargetsUIHandler::TargetCallback& callback) {
   RemoteBrowsers::iterator it = remote_browsers_.find(browser_id);
-  if (it !=  remote_browsers_.end())
-    it->second->Open(url, base::Bind(&CallOnTarget, callback));
+  if (it == remote_browsers_.end())
+    return;
+
+  DevToolsAndroidBridge* android_bridge =
+      DevToolsAndroidBridge::Factory::GetForProfile(profile_);
+  if (android_bridge)

[dgozman, 2014/09/25 14:23:17]

This class needs a getter android_bridge().

[vkuzkokov, 2014/09/25 16:48:47]

GetAndroidBridge(). android_bridge() implies trivial operation which it doesn't
seem like.

+    android_bridge->Open(it->second, url, base::Bind(&CallOnTarget, callback));
 }
 
 scoped_refptr<content::DevToolsAgentHost>
 AdbTargetsUIHandler::GetBrowserAgentHost(
     const std::string& browser_id) {
   RemoteBrowsers::iterator it = remote_browsers_.find(browser_id);
-  return it != remote_browsers_.end() ? it->second->GetAgentHost() : NULL;
+  if (it == remote_browsers_.end())
+    return NULL;
+
+  DevToolsAndroidBridge* android_bridge =
+      DevToolsAndroidBridge::Factory::GetForProfile(profile_);
+  return android_bridge ? android_bridge->GetAgentHost(it->second) : NULL;
 }
 
 void AdbTargetsUIHandler::DeviceListChanged(
@@ -331,6 +341,9 @@ void AdbTargetsUIHandler::DeviceListChanged(
   remote_browsers_.clear();
   STLDeleteValues(&targets_);
 
+  DevToolsAndroidBridge* android_bridge =
+      DevToolsAndroidBridge::Factory::GetForProfile(profile_);
+
   base::ListValue device_list;
   for (DevToolsAndroidBridge::RemoteDevices::const_iterator dit =
       devices.begin(); dit != devices.end(); ++dit) {
@@ -381,7 +394,7 @@ void AdbTargetsUIHandler::DeviceListChanged(
       remote_browsers_[browser_id] = browser;
             browser_data->Set(kAdbPagesList, page_list);
       std::vector<DevToolsAndroidBridge::RemotePage*> pages =
-          browser->CreatePages();
+          android_bridge->CreatePages(browser);
       for (std::vector<DevToolsAndroidBridge::RemotePage*>::iterator it =
           pages.begin(); it != pages.end(); ++it) {
         DevToolsAndroidBridge::RemotePage* page =  *it;