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

content/browser/frame_host/interstitial_page_impl.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 "content/browser/frame_host/interstitial_page_impl.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread.h"
 #include "build/build_config.h"
 #include "content/browser/dom_storage/dom_storage_context_wrapper.h"
 #include "content/browser/dom_storage/session_storage_namespace_impl.h"
 #include "content/browser/frame_host/interstitial_page_navigator_impl.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
+#include "content/browser/loader/loader_io_thread_notifier_impl.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_delegate_view.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/browser/web_contents/web_contents_view.h"
 #include "content/common/frame_messages.h"
@@ skipping 13 matching lines @@
 #include "net/base/escape.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/base/page_transition_types.h"
 
 using blink::WebDragOperation;
 using blink::WebDragOperationsMask;
 
 namespace content {
 namespace {
 
-void ResourceRequestHelper(ResourceDispatcherHostImpl* rdh,
-                           int process_id,
-                           int render_view_host_id,
-                           ResourceRequestAction action) {
+void ResourceRequestHelper(ResourceRequestAction action,
+                           ResourceDispatcherHostImpl* rdh,
+                           const GlobalFrameRoutingId& routing_id) {
   switch (action) {
     case BLOCK:
-      rdh->BlockRequestsForRoute(process_id, render_view_host_id);
+      rdh->BlockRequestsForFrame(routing_id);
       break;
     case RESUME:
-      rdh->ResumeBlockedRequestsForRoute(process_id, render_view_host_id);
+      rdh->ResumeBlockedRequestsForFrame(routing_id);
       break;
     case CANCEL:
-      rdh->CancelBlockedRequestsForRoute(process_id, render_view_host_id);
+      rdh->CancelBlockedRequestsForFrame(routing_id);
       break;
     default:
       NOTREACHED();
   }
 }
 
 }  // namespace
 
 class InterstitialPageImpl::InterstitialPageRVHDelegateView
   : public RenderViewHostDelegateView {
@@ skipping 751 matching lines @@
 
   if (action == CANCEL || action == RESUME) {
     if (resource_dispatcher_host_notified_)
       return;
     resource_dispatcher_host_notified_ = true;
   }
 
   // The tab might not have a render_view_host if it was closed (in which case,
   // we have taken care of the blocked requests when processing
   // NOTIFY_RENDER_WIDGET_HOST_DESTROYED.
-  // Also we need to test there is a ResourceDispatcherHostImpl, as when unit-
-  // tests we don't have one.
+  // LoaderIOThreadNotifier tests if there is a ResourceDispatcherHostImpl, as

[Randy Smith (Not in Mondays), 2016/01/06 21:56:29]

This comment seems wrong to me--LIOTN isn't testing and the test is being done
here.  Unupdated comment?

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

This code tests that we have a rvh. The LIOTN tests for RDH.

+  // unit-tests don't have one.
   RenderViewHostImpl* rvh = RenderViewHostImpl::FromID(original_child_id_,
                                                        original_rvh_id_);
-  if (!rvh || !ResourceDispatcherHostImpl::Get())
+  if (!rvh)
     return;
 
-  BrowserThread::PostTask(
-      BrowserThread::IO,
-      FROM_HERE,
-      base::Bind(
-          &ResourceRequestHelper,
-          ResourceDispatcherHostImpl::Get(),
-          original_child_id_,
-          original_rvh_id_,
-          action));
+  LoaderIOThreadNotifierImpl::NotifyForEachFrame(
+      rvh->GetDelegate()->GetFrameTree(),
+      base::Bind(&ResourceRequestHelper, action));
 }
 
 void InterstitialPageImpl::OnDomOperationResponse(
     const std::string& json_string) {
   std::string json = json_string;
   // Needed by test code.
   NotificationService::current()->Notify(NOTIFICATION_DOM_OPERATION_RESPONSE,
                                          Source<WebContents>(web_contents()),
                                          Details<std::string>(&json));
 
@@ skipping 73 matching lines @@
 void InterstitialPageImpl::UnderlyingContentObserver::NavigationEntryCommitted(
     const LoadCommittedDetails& load_details) {
   interstitial_->OnNavigatingAwayOrTabClosing();
 }
 
 void InterstitialPageImpl::UnderlyingContentObserver::WebContentsDestroyed() {
   interstitial_->OnNavigatingAwayOrTabClosing();
 }
 
 }  // namespace content