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

extensions/browser/app_window/app_window_contents.cc

 // Copyright 2013 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 "extensions/browser/app_window/app_window_contents.h"
 
 #include <string>
 #include <utility>
 
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/loader_io_thread_notifier.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/renderer_preferences.h"
 #include "extensions/browser/app_window/native_app_window.h"
 #include "extensions/common/extension_messages.h"
 
@@ skipping 60 matching lines @@
   content::RenderFrameHost* rfh = web_contents_->GetMainFrame();
   rfh->Send(new ExtensionMsg_MessageInvoke(
       rfh->GetRoutingID(), host_->extension_id(), "app.window",
       "appWindowShownForTests", args, false));
 }
 
 void AppWindowContentsImpl::OnWindowReady() {
   is_window_ready_ = true;
   if (is_blocking_requests_) {
     is_blocking_requests_ = false;
-    content::RenderFrameHost* frame = web_contents_->GetMainFrame();
-    content::BrowserThread::PostTask(
-        content::BrowserThread::IO, FROM_HERE,
-        base::Bind(
-            &content::ResourceDispatcherHost::ResumeBlockedRequestsForRoute,
-            base::Unretained(content::ResourceDispatcherHost::Get()),
-            frame->GetProcess()->GetID(),
-            frame->GetRenderViewHost()->GetRoutingID()));
+    content::LoaderIOThreadNotifier::ResumeBlockedRequestsForFrame(
+        web_contents_->GetMainFrame());
   }
 }
 
 content::WebContents* AppWindowContentsImpl::GetWebContents() const {
   return web_contents_.get();
 }
 
 WindowController* AppWindowContentsImpl::GetWindowController() const {
   return nullptr;
 }
@@ skipping 19 matching lines @@
   host_->UpdateDraggableRegions(regions);
 }
 
 void AppWindowContentsImpl::SuspendRenderFrameHost(
     content::RenderFrameHost* rfh) {
   DCHECK(rfh);
   // Don't bother blocking requests if the renderer side is already good to go.
   if (is_window_ready_)
     return;
   is_blocking_requests_ = true;
-  // The ResourceDispatcherHost only accepts RenderViewHost child ids.
-  // TODO(devlin): This will need to change for site isolation.
-  content::BrowserThread::PostTask(
-      content::BrowserThread::IO, FROM_HERE,
-      base::Bind(&content::ResourceDispatcherHost::BlockRequestsForRoute,
-                 base::Unretained(content::ResourceDispatcherHost::Get()),
-                 rfh->GetProcess()->GetID(),
-                 rfh->GetRenderViewHost()->GetRoutingID()));
+  content::LoaderIOThreadNotifier::BlockRequestsForFrame(rfh);

[nasko, 2016/01/07 00:43:09]

Can we stick those methods on an existing class that is a bit easier to
understand? Looking from outside of content, I have very little idea what the
loader notifier is and shouldn't really care much that there is IO thread
involved in this.

Leaving the method on RDH seems better to me or even putting it on
RenderFrameHost itself.

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

Yeah, I think I'll merge the LoaderIOThreadNotifier into RDHI.

 }
 
 }  // namespace extensions