Index: content/browser/frame_host/render_frame_host_manager.h |
diff --git a/content/browser/frame_host/render_frame_host_manager.h b/content/browser/frame_host/render_frame_host_manager.h |
index e208aa4c9838313cb287f466e8374cdb48ca03eb..2c3778f12995234df308fa82235280b4e216b77d 100644 |
--- a/content/browser/frame_host/render_frame_host_manager.h |
+++ b/content/browser/frame_host/render_frame_host_manager.h |
@@ -483,9 +483,12 @@ class CONTENT_EXPORT RenderFrameHostManager |
// an inner WebContents. |
void SetRWHViewForInnerContents(RenderWidgetHostView* child_rwhv); |
- // Returns a copy of the map of proxy hosts. The keys are SiteInstance IDs, |
- // the values are RenderFrameProxyHosts. |
- std::map<int, RenderFrameProxyHost*> GetAllProxyHostsForTesting(); |
+ // Returns a const reference to the map of proxy hosts. The keys are |
+ // SiteInstance IDs, the values are RenderFrameProxyHosts. |
+ const std::unordered_map<int32_t, scoped_ptr<RenderFrameProxyHost>>& |
+ GetAllProxyHosts() const { |
+ return proxy_hosts_; |
+ } |
// SiteInstanceImpl::Observer |
void ActiveFrameCountIsZero(SiteInstanceImpl* site_instance) override; |
@@ -751,8 +754,7 @@ class CONTENT_EXPORT RenderFrameHostManager |
scoped_ptr<NavigationHandleImpl> transfer_navigation_handle_; |
// Proxy hosts, indexed by site instance ID. |
- base::ScopedPtrHashMap<int32_t, scoped_ptr<RenderFrameProxyHost>> |
- proxy_hosts_; |
+ std::unordered_map<int32_t, scoped_ptr<RenderFrameProxyHost>> proxy_hosts_; |
// A list of RenderFrameHosts waiting to shut down after swapping out. |
using RFHPendingDeleteList = std::list<scoped_ptr<RenderFrameHostImpl>>; |