[on hold] Remove dependency on RenderViewHost from LoadState notifications

content/browser/loader/resource_dispatcher_host_impl.cc

Index: content/browser/loader/resource_dispatcher_host_impl.cc
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
index da256df980413b76fe334efae34d9216b3394399..8ac41bb8f818ddc1e0db3ab271f476458e0d6270 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.cc
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -56,7 +56,6 @@
 #include "content/browser/loader/power_save_block_resource_throttle.h"
 #include "content/browser/loader/redirect_to_file_resource_handler.h"
 #include "content/browser/loader/resource_message_filter.h"
-#include "content/browser/loader/resource_request_info_impl.h"
 #include "content/browser/loader/stream_resource_handler.h"
 #include "content/browser/loader/sync_resource_handler.h"
 #include "content/browser/loader/throttling_resource_handler.h"
@@ -2466,7 +2465,18 @@ bool ResourceDispatcherHostImpl::LoadInfoIsMoreInteresting(const LoadInfo& a,
   return a.load_state.state > b.load_state.state;
 }
 
-// static
+ResourceDispatcherHostImpl::LoadInfo::LoadInfo() {}
+
+ResourceDispatcherHostImpl::LoadInfo::~LoadInfo() {}
+
+ResourceDispatcherHostImpl::LoadInfo::LoadInfo(const LoadInfo& info) {
+  url = info.url;
+  load_state = info.load_state;
+  upload_position = info.upload_position;
+  upload_size = info.upload_size;
+  web_contents_getter = info.web_contents_getter;
+}
+
 void ResourceDispatcherHostImpl::UpdateLoadInfoOnUIThread(
     std::unique_ptr<LoadInfoMap> info_map) {
   // TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466285
@@ -2475,14 +2485,26 @@ void ResourceDispatcherHostImpl::UpdateLoadInfoOnUIThread(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "466285 ResourceDispatcherHostImpl::UpdateLoadInfoOnUIThread"));
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  std::map<WebContents*, const LoadInfo*> contents_map;
   for (const auto& load_info : *info_map) {
-    RenderViewHostImpl* view = RenderViewHostImpl::FromID(
-        load_info.first.child_id, load_info.first.route_id);
-    // The view could be gone at this point.
-    if (view) {
-      view->LoadStateChanged(load_info.second.url, load_info.second.load_state,
-                             load_info.second.upload_position,
-                             load_info.second.upload_size);
+    WebContents* web_contents = load_info.second.web_contents_getter.Run();
+    if (!web_contents)
+      continue;
+    auto existing = contents_map.find(web_contents);
+    if (existing == contents_map.end() ||
+        LoadInfoIsMoreInteresting(load_info.second, *existing->second)) {
+      contents_map[web_contents] = &load_info.second;
+    }
+  }
+  for (const auto& it : contents_map) {
+    // Re-run the getter to prevent u-a-f errors if calling LoadStateChanged on

[nasko, 2016/06/02 22:04:21]

Please expand u-a-f, as it isn't really common abbreviation.

[Charlie Harrison, 2016/06/06 15:39:53]

Done.

+    // one WebContents deletes another one.
+    WebContentsImpl* web_contents =
+        static_cast<WebContentsImpl*>(it.second->web_contents_getter.Run());
+    if (web_contents) {
+      web_contents->LoadStateChanged(it.second->url, it.second->load_state,
+                                     it.second->upload_position,
+                                     it.second->upload_size);
     }
   }
 }
@@ -2490,7 +2512,7 @@ void ResourceDispatcherHostImpl::UpdateLoadInfoOnUIThread(
 std::unique_ptr<ResourceDispatcherHostImpl::LoadInfoMap>
 ResourceDispatcherHostImpl::GetLoadInfoForAllRoutes() {
   // Populate this map with load state changes, and then send them on to the UI
-  // thread where they can be passed along to the respective RVHs.
+  // thread where they can be passed along to the respective WebContents.
   std::unique_ptr<LoadInfoMap> info_map(new LoadInfoMap());
 
   for (const auto& loader : pending_loaders_) {
@@ -2502,8 +2524,11 @@ ResourceDispatcherHostImpl::GetLoadInfoForAllRoutes() {
     load_info.load_state = request->GetLoadState();
     load_info.upload_size = upload_progress.size();
     load_info.upload_position = upload_progress.position();
+    load_info.web_contents_getter =
+        loader.second->GetRequestInfo()->GetWebContentsGetterForRequest();
 
-    GlobalRoutingID id(loader.second->GetRequestInfo()->GetGlobalRoutingID());
+    GlobalFrameRoutingId id(
+        loader.second->GetRequestInfo()->GetGlobalFrameRoutingId());
     LoadInfoMap::iterator existing = info_map->find(id);
 
     if (existing == info_map->end() ||
@@ -2515,6 +2540,8 @@ ResourceDispatcherHostImpl::GetLoadInfoForAllRoutes() {
 }
 
 void ResourceDispatcherHostImpl::UpdateLoadInfo() {
+  // Group LoadInfo by frame, then pass to the UI thread where each WebContents
+  // picks the most interesting one.
   std::unique_ptr<LoadInfoMap> info_map(GetLoadInfoForAllRoutes());
 
   // Stop the timer if there are no more pending requests. Future new requests