DevTools: Split RemotePage and RemotePageTarget

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 91ac597981ec89e46b91ea80f830c2832fa9d7ea..9c176448e1feb9d31cc7ce2fc86d3003336abae4 100644
--- a/chrome/browser/devtools/devtools_targets_ui.cc
+++ b/chrome/browser/devtools/devtools_targets_ui.cc
@@ -305,9 +305,9 @@ AdbTargetsUIHandler::~AdbTargetsUIHandler() {
 
 static void CallOnTarget(
     const DevToolsTargetsUIHandler::TargetCallback& callback,
-    DevToolsAndroidBridge::RemotePage* page) {
-  scoped_ptr<DevToolsAndroidBridge::RemotePage> my_page(page);
-  callback.Run(my_page ? my_page->GetTarget() : NULL);
+    scoped_refptr<DevToolsAndroidBridge> bridge,
+    scoped_refptr<DevToolsAndroidBridge::RemotePage> page) {
+  callback.Run(page.get() ? bridge->CreatePageTarget(page) : NULL);
 }
 
 void AdbTargetsUIHandler::Open(
@@ -318,9 +318,11 @@ void AdbTargetsUIHandler::Open(
   if (it == remote_browsers_.end())
     return;
 
-  DevToolsAndroidBridge* android_bridge = GetAndroidBridge();
-  if (android_bridge)
-    android_bridge->Open(it->second, url, base::Bind(&CallOnTarget, callback));
+  scoped_refptr<DevToolsAndroidBridge> android_bridge = GetAndroidBridge();

[dgozman, 2014/09/30 09:23:48]

scoped_refptr<DevToolsAndroidBridge> android_bridge(GetAndroidBridge());

[vkuzkokov, 2014/10/01 09:05:17]

Done.

+  if (android_bridge.get()) {
+    android_bridge->Open(it->second, url,
+                         base::Bind(&CallOnTarget, callback, android_bridge));
+  }
 }
 
 scoped_refptr<content::DevToolsAgentHost>
@@ -390,12 +392,10 @@ void AdbTargetsUIHandler::DeviceListChanged(
       base::ListValue* page_list = new base::ListValue();
       remote_browsers_[browser_id] = browser;
             browser_data->Set(kAdbPagesList, page_list);
-      std::vector<DevToolsAndroidBridge::RemotePage*> pages =
-          android_bridge->CreatePages(browser);
-      for (std::vector<DevToolsAndroidBridge::RemotePage*>::iterator it =
+      const DevToolsAndroidBridge::RemotePages& pages = browser->pages();
+      for (DevToolsAndroidBridge::RemotePages::const_iterator it =
           pages.begin(); it != pages.end(); ++it) {
-        DevToolsAndroidBridge::RemotePage* page =  *it;
-        DevToolsTargetImpl* target = page->GetTarget();
+        DevToolsTargetImpl* target = android_bridge->CreatePageTarget(*it);
         base::DictionaryValue* target_data = Serialize(*target);
         target_data->SetBoolean(
             kAdbAttachedForeignField,