DevTools: Split RemotePage and RemotePageTarget

chrome/browser/devtools/devtools_targets_ui.cc

 // Copyright 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_targets_ui.h"
 
 #include "base/memory/weak_ptr.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
@@ skipping 300 matching lines @@
   DCHECK(android_bridge_.get());
   android_bridge_->AddDeviceListListener(this);
 }
 
 AdbTargetsUIHandler::~AdbTargetsUIHandler() {
   android_bridge_->RemoveDeviceListListener(this);
 }
 
 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);

[dgozman, 2014/10/15 14:53:12]

nit: nullptr

[vkuzkokov, 2014/10/15 15:24:19]

Done.

 }
 
 void AdbTargetsUIHandler::Open(
     const std::string& browser_id,
     const std::string& url,
     const DevToolsTargetsUIHandler::TargetCallback& callback) {
   RemoteBrowsers::iterator it = remote_browsers_.find(browser_id);
   if (it == remote_browsers_.end())
     return;
 
-  android_bridge_->OpenRemotePage(it->second, url,
-                                  base::Bind(&CallOnTarget, callback));
+  android_bridge_->OpenRemotePage(
+      it->second,
+      url,
+      base::Bind(&CallOnTarget, callback, android_bridge_));
 }
 
 scoped_refptr<content::DevToolsAgentHost>
 AdbTargetsUIHandler::GetBrowserAgentHost(
     const std::string& browser_id) {
   RemoteBrowsers::iterator it = remote_browsers_.find(browser_id);
   if (it == remote_browsers_.end())
     return NULL;
 
   return android_bridge_->GetBrowserAgentHost(it->second);
@@ skipping 41 matching lines @@
       chrome::VersionInfo version_info;
       base::Version local_version(version_info.Version());
 
       browser_data->SetBoolean(kCompatibleVersion,
           (!remote_version.IsValid()) || (!local_version.IsValid()) ||
           remote_version.components()[0] <= local_version.components()[0]);
 
       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 =

[dgozman, 2014/10/15 14:53:12]

nit: use for range iteration and auto

[vkuzkokov, 2014/10/15 15:24:19]

Done.

           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,
             target->IsAttached() &&
                 !android_bridge_->HasDevToolsWindow(target->GetId()));
         // Pass the screen size in the target object to make sure that
         // the caching logic does not prevent the target item from updating
         // when the screen size changes.
         gfx::Size screen_size = device->screen_size();
         target_data->SetInteger(kAdbScreenWidthField, screen_size.width());
@@ skipping 118 matching lines @@
     device_status_dict->SetString(kPortForwardingBrowserId,
                                   SerializeBrowserId(sit->first));
 
     std::string device_id = base::StringPrintf(
         kAdbDeviceIdFormat,
         sit->first->serial().c_str());
     result.Set(device_id, device_status_dict);
   }
   callback_.Run(result);
 }