6 files changed, 11 insertions, 10 deletions
diff --git a/chrome/browser/devtools/device/usb/android_usb_device.cc b/chrome/browser/devtools/device/usb/android_usb_device.cc
index c3f5754..3a2bee1 100644
--- a/chrome/browser/devtools/device/usb/android_usb_device.cc
+++ b/chrome/browser/devtools/device/usb/android_usb_device.cc
@@ -621,7 +621,7 @@ void AndroidUsbDevice::TransferError(UsbTransferStatus status) {
 void AndroidUsbDevice::TerminateIfReleased(
     scoped_refptr<UsbDeviceHandle> usb_handle) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  if (usb_handle->GetDevice())
+  if (usb_handle->GetDevice().get())
     return;
   message_loop_->PostTask(FROM_HERE,
                           base::Bind(&AndroidUsbDevice::Terminate, this));
diff --git a/chrome/browser/devtools/devtools_ui_bindings.cc b/chrome/browser/devtools/devtools_ui_bindings.cc
index d4b9c9b..5dafffb 100644
--- a/chrome/browser/devtools/devtools_ui_bindings.cc
+++ b/chrome/browser/devtools/devtools_ui_bindings.cc
@@ -793,7 +793,8 @@ void DevToolsUIBindings::SetDelegate(Delegate* delegate) {
   delegate_.reset(delegate);
 }
 
-void DevToolsUIBindings::AttachTo(content::DevToolsAgentHost* agent_host) {
+void DevToolsUIBindings::AttachTo(
+    const scoped_refptr<content::DevToolsAgentHost>& agent_host) {
   if (agent_host_.get())
     Detach();
   agent_host_ = agent_host;
diff --git a/chrome/browser/devtools/devtools_ui_bindings.h b/chrome/browser/devtools/devtools_ui_bindings.h
index 37e775dd..52eefc3 100644
--- a/chrome/browser/devtools/devtools_ui_bindings.h
+++ b/chrome/browser/devtools/devtools_ui_bindings.h
@@ -73,7 +73,7 @@ class DevToolsUIBindings : public content::NotificationObserver,
                           const base::Value* arg1,
                           const base::Value* arg2,
                           const base::Value* arg3);
-  void AttachTo(content::DevToolsAgentHost* agent_host);
+  void AttachTo(const scoped_refptr<content::DevToolsAgentHost>& agent_host);
   void Reattach();
   void Detach();
   bool IsAttachedTo(content::DevToolsAgentHost* agent_host);
diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc
index 612f2a3..16ffe90 100644
--- a/chrome/browser/devtools/devtools_window.cc
+++ b/chrome/browser/devtools/devtools_window.cc
@@ -419,8 +419,8 @@ bool DevToolsWindow::IsDevToolsWindow(content::WebContents* web_contents) {
 // static
 DevToolsWindow* DevToolsWindow::OpenDevToolsWindowForWorker(
     Profile* profile,
-    DevToolsAgentHost* worker_agent) {
-  DevToolsWindow* window = FindDevToolsWindow(worker_agent);
+    const scoped_refptr<DevToolsAgentHost>& worker_agent) {
+  DevToolsWindow* window = FindDevToolsWindow(worker_agent.get());
   if (!window) {
     window = DevToolsWindow::CreateDevToolsWindowForWorker(profile);
     window->bindings_->AttachTo(worker_agent);
@@ -470,9 +470,9 @@ DevToolsWindow* DevToolsWindow::ToggleDevToolsWindow(
 void DevToolsWindow::OpenExternalFrontend(
     Profile* profile,
     const std::string& frontend_url,
-    content::DevToolsAgentHost* agent_host,
+    const scoped_refptr<content::DevToolsAgentHost>& agent_host,
     bool isWorker) {
-  DevToolsWindow* window = FindDevToolsWindow(agent_host);
+  DevToolsWindow* window = FindDevToolsWindow(agent_host.get());
   if (!window) {
     window = Create(profile, DevToolsUI::GetProxyURL(frontend_url), NULL,
                     isWorker, true, false, "");
diff --git a/chrome/browser/devtools/devtools_window.h b/chrome/browser/devtools/devtools_window.h
index 1805e9a..6562de7 100644
--- a/chrome/browser/devtools/devtools_window.h
+++ b/chrome/browser/devtools/devtools_window.h
@@ -82,13 +82,13 @@ class DevToolsWindow : public DevToolsUIBindings::Delegate,
   static void OpenExternalFrontend(
       Profile* profile,
       const std::string& frontend_uri,
-      content::DevToolsAgentHost* agent_host,
+      const scoped_refptr<content::DevToolsAgentHost>& agent_host,
       bool isWorker);
 
   // Worker frontend is always undocked.
   static DevToolsWindow* OpenDevToolsWindowForWorker(
       Profile* profile,
-      content::DevToolsAgentHost* worker_agent);
+      const scoped_refptr<content::DevToolsAgentHost>& worker_agent);
 
   static void InspectElement(content::WebContents* inspected_web_contents,
                              int x,
diff --git a/chrome/browser/ui/webui/inspect_ui.cc b/chrome/browser/ui/webui/inspect_ui.cc
index 8a13689..a5b152f 100644
--- a/chrome/browser/ui/webui/inspect_ui.cc
+++ b/chrome/browser/ui/webui/inspect_ui.cc
@@ -343,7 +343,7 @@ void InspectUI::InspectBrowserWithCustomFrontend(
   // Install devtools bindings.
   DevToolsUIBindingsEnabler* bindings_enabler =
       new DevToolsUIBindingsEnabler(front_end, frontend_url);
-  bindings_enabler->GetBindings()->AttachTo(agent_host.get());
+  bindings_enabler->GetBindings()->AttachTo(agent_host);
 }
 
 void InspectUI::InspectDevices(Browser* browser) {