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 ec879b5713a137a2bae694b27de2c228a44faa70..d3d36b55ed5d48519f8dca6f8a801928d51f19c5 100644 |
--- a/content/browser/frame_host/render_frame_host_manager.h |
+++ b/content/browser/frame_host/render_frame_host_manager.h |
@@ -486,9 +486,15 @@ class CONTENT_EXPORT RenderFrameHostManager |
// Returns the number of RenderFrameProxyHosts for this frame. |
int GetProxyCount(); |
- // Returns a copy of the map of proxy hosts. The keys are SiteInstance IDs, |
- // the values are RenderFrameProxyHosts. |
- std::map<int, RenderFrameProxyHost*> GetAllProxyHostsForTesting(); |
+ // Sends an IPC message to every RenderView in the FrameTree. |
nasko
2016/02/12 18:14:08
nit: Let's drop the RenderView part, as while tech
lfg
2016/03/02 18:29:08
Done.
|
+ void SendPageMsg(IPC::Message* msg); |
nasko
2016/02/12 18:14:08
nit: Sorry, should've been more correct. SendPageM
lfg
2016/03/02 18:29:08
Done.
|
+ |
+ // 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>>& |
+ GetAllProxyHostsForTesting() const { |
+ return proxy_hosts_; |
+ } |
// SiteInstanceImpl::Observer |
void ActiveFrameCountIsZero(SiteInstanceImpl* site_instance) override; |
@@ -754,8 +760,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_; |
nasko
2016/02/12 18:14:08
Why make this change in this CL?
lfg
2016/03/02 18:29:08
Moved to another CL.
|
// A list of RenderFrameHosts waiting to shut down after swapping out. |
using RFHPendingDeleteList = std::list<scoped_ptr<RenderFrameHostImpl>>; |