DevTools: Split RemotePage and RemotePageTarget

chrome/browser/ui/webui/devtools_ui.cc

 // Copyright (c) 2012 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/ui/webui/devtools_ui.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted_memory.h"
@@ skipping 250 matching lines @@
       Profile* profile,
       const std::string url,
       const DevToolsAndroidBridge::RemotePageCallback& callback);
   virtual ~OpenRemotePageRequest() {}
 
  private:
   // DevToolsAndroidBridge::Listener overrides.
   virtual void DeviceListChanged(
       const DevToolsAndroidBridge::RemoteDevices& devices) OVERRIDE;
 
-  bool OpenInBrowser(DevToolsAndroidBridge::RemoteBrowser* browser);
-  void RemotePageOpened(DevToolsAndroidBridge::RemotePage* page);
+  bool OpenInBrowser(
+      scoped_refptr<DevToolsAndroidBridge::RemoteBrowser> browser);
+  void RemotePageOpened(scoped_refptr<DevToolsAndroidBridge::RemotePage> page);
 
   std::string url_;
   DevToolsAndroidBridge::RemotePageCallback callback_;
   bool opening_;
   scoped_refptr<DevToolsAndroidBridge> android_bridge_;
 
   DISALLOW_COPY_AND_ASSIGN(OpenRemotePageRequest);
 };
 
 OpenRemotePageRequest::OpenRemotePageRequest(
@@ skipping 24 matching lines @@
         browsers.begin(); bit != browsers.end(); ++bit) {
       if (OpenInBrowser(bit->get())) {
         opening_ = true;
         return;
       }
     }
   }
 }
 
 bool OpenRemotePageRequest::OpenInBrowser(
-    DevToolsAndroidBridge::RemoteBrowser* browser) {
+    scoped_refptr<DevToolsAndroidBridge::RemoteBrowser> browser) {
   if (!browser->IsChrome())
     return false;
 #if defined(DEBUG_DEVTOOLS)
   if (browser->serial() == kLocalSerial)
     return false;
 #endif  // defined(DEBUG_DEVTOOLS)
   android_bridge_->Open(browser, url_,
                         base::Bind(&OpenRemotePageRequest::RemotePageOpened,
                                    base::Unretained(this)));
   return true;
 }
 
 void OpenRemotePageRequest::RemotePageOpened(
-    DevToolsAndroidBridge::RemotePage* page) {
+    scoped_refptr<DevToolsAndroidBridge::RemotePage> page) {
   callback_.Run(page);
   android_bridge_->RemoveDeviceListListener(this);
   delete this;
 }
 
 }  // namespace
 
 // DevToolsUI -----------------------------------------------------------------
 
 // static
@@ skipping 43 matching lines @@
   bindings_.Detach();
   remote_page_opening_url_ = entry->GetVirtualURL();
   new OpenRemotePageRequest(Profile::FromWebUI(web_ui()),
                             entry->GetVirtualURL().query(),
                             base::Bind(&DevToolsUI::RemotePageOpened,
                                        weak_factory_.GetWeakPtr(),
                                        entry->GetVirtualURL()));
 }
 
 void DevToolsUI::RemotePageOpened(
-    const GURL& virtual_url, DevToolsAndroidBridge::RemotePage* page) {
+    const GURL& virtual_url,
+    scoped_refptr<DevToolsAndroidBridge::RemotePage> page) {
   // Already navigated away while connecting to remote device.
   if (remote_page_opening_url_ != virtual_url)
     return;
 
-  scoped_ptr<DevToolsAndroidBridge::RemotePage> my_page(page);
+  scoped_refptr<DevToolsAndroidBridge::RemotePage> my_page = page;

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

Remove this |my_page|.

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

Done.

   remote_page_opening_url_ = GURL();
 
   Profile* profile = Profile::FromWebUI(web_ui());
   GURL url = DevToolsUIBindings::ApplyThemeToURL(profile,
-      DevToolsUI::GetProxyURL(page->GetFrontendURL()));
+      DevToolsUI::GetProxyURL(page->frontend_url()));
 
   content::NavigationController& navigation_controller =
       web_ui()->GetWebContents()->GetController();
   content::NavigationController::LoadURLParams params(url);
   params.should_replace_current_entry = true;
   remote_frontend_loading_url_ = virtual_url;
   navigation_controller.LoadURLWithParams(params);
   navigation_controller.GetPendingEntry()->SetVirtualURL(virtual_url);
 
-  bindings_.AttachTo(page->GetTarget()->GetAgentHost());
+  DevToolsAndroidBridge* bridge =
+      DevToolsAndroidBridge::Factory::GetForProfile(profile);
+  DevToolsTargetImpl* target = bridge->CreatePageTarget(page);
+  bindings_.AttachTo(target->GetAgentHost());
+  delete target;
 }