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

content/browser/browser_plugin/browser_plugin_guest.cc

Index: content/browser/browser_plugin/browser_plugin_guest.cc
diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc
index 33262a832e5803f3baa57fbd231f72c947cd5481..613e3ac356afe3e7e15dbd21aeedd4d67ac48a02 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.cc
+++ b/content/browser/browser_plugin/browser_plugin_guest.cc
@@ -791,6 +791,7 @@ void BrowserPluginGuest::OnWillAttachComplete(
     static_cast<RenderViewHostImpl*>(GetWebContents()->GetRenderViewHost())
         ->GetWidget()
         ->Init();
+    GetWebContents()->GetMainFrame()->Init();

[nasko, 2016/01/07 19:58:39]

Uh, this is unfortunate. Can we avoid calling this explicitly?

[Charlie Harrison, 2016/01/07 22:47:05]

Yeah this is extremely ugly. All the original code has resuming done in the
RenderWidgetHostImpl::Init()

Having that method resume for the main frame seems ugly too, though.

What do you thing the best approach is?

     WebContentsViewGuest* web_contents_view =
         static_cast<WebContentsViewGuest*>(GetWebContents()->GetView());
     if (!web_contents()->GetRenderViewHost()->GetWidget()->GetView()) {