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

content/browser/browser_plugin/browser_plugin_guest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/browser_plugin/browser_plugin_guest.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 773 matching lines @@
   bool use_cross_process_frames =
       BrowserPluginGuestMode::UseCrossProcessFramesForGuests();
   // If a RenderView has already been created for this new window, then we need
   // to initialize the browser-side state now so that the RenderFrameHostManager
   // does not create a new RenderView on navigation.
   if (!use_cross_process_frames && has_render_view_) {
     // This will trigger a callback to RenderViewReady after a round-trip IPC.
     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()) {
       web_contents_view->CreateViewForWidget(
           web_contents()->GetRenderViewHost()->GetWidget(), true);
     }
   }
 
   InitInternal(params, embedder_web_contents);
 
@@ skipping 259 matching lines @@
           range, character_bounds);
 }
 #endif
 
 void BrowserPluginGuest::SetContextMenuPosition(const gfx::Point& position) {
   if (delegate_)
     delegate_->SetContextMenuPosition(position);
 }
 
 }  // namespace content