2 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/usb/usb_tab_helper.cc b/chrome/browser/usb/usb_tab_helper.cc
index 152dd0d..29f875a 100644
--- a/chrome/browser/usb/usb_tab_helper.cc
+++ b/chrome/browser/usb/usb_tab_helper.cc
@@ -51,7 +51,7 @@ void UsbTabHelper::GetPermissionProvider(
     scoped_ptr<WebUSBPermissionProvider> permission_provider(
         new WebUSBPermissionProvider(render_frame_host));
     permission_provider->Bind(request.Pass());
-    permission_provider_.set(render_frame_host, permission_provider.Pass());
+    permission_provider_[render_frame_host] = permission_provider.Pass();
   } else {
     it->second->Bind(request.Pass());
   }
diff --git a/chrome/browser/usb/usb_tab_helper.h b/chrome/browser/usb/usb_tab_helper.h
index c2bb342..003f8dd 100644
--- a/chrome/browser/usb/usb_tab_helper.h
+++ b/chrome/browser/usb/usb_tab_helper.h
@@ -5,7 +5,8 @@
 #ifndef CHROME_BROWSER_USB_USB_TAB_HELPER_H_
 #define CHROME_BROWSER_USB_USB_TAB_HELPER_H_
 
-#include "base/containers/scoped_ptr_map.h"
+#include <map>
+
 #include "base/macros.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
@@ -44,8 +45,8 @@ class UsbTabHelper : public content::WebContentsObserver,
       content::RenderFrameHost* render_frame_host,
       mojo::InterfaceRequest<device::usb::PermissionProvider> request);
 
-  base::ScopedPtrMap<content::RenderFrameHost*,
-                     scoped_ptr<WebUSBPermissionProvider>> permission_provider_;
+  std::map<content::RenderFrameHost*, scoped_ptr<WebUSBPermissionProvider>>
+      permission_provider_;
 
   DISALLOW_COPY_AND_ASSIGN(UsbTabHelper);
 };