[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"
@@ skipping 35 matching lines @@
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/bindings_policy.h"
 #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) {
-  switch (action) {
-    case BLOCK:
-      rdh->BlockRequestsForRoute(process_id, render_view_host_id);
-      break;
-    case RESUME:
-      rdh->ResumeBlockedRequestsForRoute(process_id, render_view_host_id);
-      break;
-    case CANCEL:
-      rdh->CancelBlockedRequestsForRoute(process_id, render_view_host_id);
-      break;
-    default:
-      NOTREACHED();
-  }
-}
-
-}  // namespace
 
 class InterstitialPageImpl::InterstitialPageRVHDelegateView
   : public RenderViewHostDelegateView {
  public:
   explicit InterstitialPageRVHDelegateView(InterstitialPageImpl* page);
 
   // RenderViewHostDelegateView implementation:
 #if defined(OS_MACOSX) || defined(OS_ANDROID)
   void ShowPopupMenu(RenderFrameHost* render_frame_host,
                      const gfx::Rect& bounds,
@@ skipping 744 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.
+  // ResourceDispatcherHostImpl tests its own existence, as unit-tests don't
+  // have one.

[Randy Smith (Not in Mondays), 2016/01/20 23:23:19]

I think this comment isn't needed anymore.

[Charlie Harrison, 2016/01/21 18:52:55]

Done.

   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));
+  base::Callback<void(ResourceDispatcherHostImpl*, const GlobalFrameRoutingId&)>
+      frame_callback = base::Bind([](ResourceRequestAction action) {
+        switch (action) {
+          case BLOCK:
+            return &ResourceDispatcherHostImpl::BlockRequestsForRoute;
+          case RESUME:
+            return &ResourceDispatcherHostImpl::ResumeBlockedRequestsForRoute;
+          default:
+            DCHECK_EQ(action, CANCEL);
+            return &ResourceDispatcherHostImpl::CancelBlockedRequestsForRoute;
+        }
+      }(action));
+  ResourceDispatcherHostImpl::NotifyForEachFrame(
+      rvh->GetDelegate()->GetFrameTree(), frame_callback);

[Randy Smith (Not in Mondays), 2016/01/20 23:23:19]

Suggestion: IMO, this code would be simpler and more understandable if it just
called NotifyForEachFrame with the constructed callback from each branch of the
switch statement.

[Charlie Harrison, 2016/01/21 18:52:55]

Done.

 }
 
 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