[RDHI] Refactored blocked_loaders_map_ to key by render frame route id

content/browser/web_contents/web_contents_impl.cc

Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 956831386b133641428afd818ee075f0ba86cb72..97cc6000f4891c86d982c1127e20bc6129d94091 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -409,6 +409,7 @@ WebContentsImpl::WebContentsImpl(BrowserContext* browser_context)
   frame_tree_.SetFrameRemoveListener(
       base::Bind(&WebContentsImpl::OnFrameRemoved,
                  base::Unretained(this)));
+  loader_io_thread_notifier_.reset(new LoaderIOThreadNotifer(this));

[Randy Smith (Not in Mondays), 2015/12/29 23:11:37]

I'm confused; naively, it looks like you're never using this object after you
construct it.

[Charlie Harrison, 2015/12/30 20:51:49]

The only way this gets used is as a WebContentsObserver (passing |this| starts
observing). I included it as a scoped pointer here for lifetime reasons. I
wasn't sure if there was a better way to do this. It also might be useful later
if WCO methods need to call methods directly (too specialized for WCO
callbacks).

[Randy Smith (Not in Mondays), 2016/01/04 21:24:48]

Right, whoops, sorry I missed that.  I'm good with this.

   media_web_contents_observer_.reset(new MediaWebContentsObserver(this));
   wake_lock_service_context_.reset(new WakeLockServiceContext(this));
 }
@@ -1812,7 +1813,8 @@ void WebContentsImpl::CreateNewWindow(
       // delete the RenderView that had already been created.
       Send(new ViewMsg_Close(route_id));
     }
-    GetRenderViewHost()->GetProcess()->ResumeRequestsForView(route_id);
+    GetRenderViewHost()->GetProcess()->ResumeRequestsForFrame(
+        main_frame_route_id);
     return;
   }