Allow asynchronous deferral in NavigationSimulator

content/test/test_render_frame_host.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/test/test_render_frame_host.h"
 
 #include "base/guid.h"
 #include "base/run_loop.h"
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/navigation_handle_impl.h"
@@ skipping 16 matching lines @@
 #include "net/http/http_response_headers.h"
 #include "third_party/WebKit/public/platform/WebMixedContentContextType.h"
 #include "third_party/WebKit/public/platform/WebPageVisibilityState.h"
 #include "third_party/WebKit/public/platform/modules/bluetooth/web_bluetooth.mojom.h"
 #include "third_party/WebKit/public/web/WebSandboxFlags.h"
 #include "third_party/WebKit/public/web/WebTreeScopeType.h"
 #include "ui/base/page_transition_types.h"
 
 namespace content {
 
+namespace {
+
+void CallbackRunner(const base::Closure& closure,
+                    NavigationThrottle::ThrottleCheckResult result) {
+  closure.Run();
+}
+
+}  // namesapce
+
 TestRenderFrameHostCreationObserver::TestRenderFrameHostCreationObserver(
     WebContents* web_contents)
     : WebContentsObserver(web_contents), last_created_frame_(NULL) {
 }
 
 TestRenderFrameHostCreationObserver::~TestRenderFrameHostCreationObserver() {
 }
 
 void TestRenderFrameHostCreationObserver::RenderFrameCreated(
     RenderFrameHost* render_frame_host) {
@@ skipping 68 matching lines @@
   OnDidStartLoading(true);
   OnDidStartProvisionalLoad(url, std::vector<GURL>(), base::TimeTicks::Now());
   SimulateWillStartRequest(ui::PAGE_TRANSITION_LINK);
 }
 
 void TestRenderFrameHost::SimulateRedirect(const GURL& new_url) {
   if (IsBrowserSideNavigationEnabled()) {
     NavigationRequest* request = frame_tree_node_->navigation_request();
     if (!request->loader_for_testing()) {
       base::RunLoop loop;
-      request->set_on_start_checks_complete_closure_for_testing(
-          loop.QuitClosure());
+      request->set_on_checks_complete_callback_for_testing(
+          base::Bind(&CallbackRunner, loop.QuitClosure()));
       loop.Run();
     }
     TestNavigationURLLoader* url_loader =
         static_cast<TestNavigationURLLoader*>(request->loader_for_testing());
     CHECK(url_loader);
     url_loader->SimulateServerRedirect(new_url);
     return;
   }
 
   navigation_handle()->CallWillRedirectRequestForTesting(new_url, false, GURL(),
@@ skipping 50 matching lines @@
     NavigationRequest* request = frame_tree_node_->navigation_request();
     CHECK(request);
     // Simulate a beforeUnload ACK from the renderer if the browser is waiting
     // for it. If it runs it will update the request state.
     if (request->state() == NavigationRequest::WAITING_FOR_RENDERER_RESPONSE) {
       static_cast<TestRenderFrameHost*>(frame_tree_node()->current_frame_host())
           ->SendBeforeUnloadACK(true);
     }
     if (!request->loader_for_testing()) {
       base::RunLoop loop;
-      request->set_on_start_checks_complete_closure_for_testing(
-          loop.QuitClosure());
+      request->set_on_checks_complete_callback_for_testing(
+          base::Bind(&CallbackRunner, loop.QuitClosure()));
       loop.Run();
     }
     TestNavigationURLLoader* url_loader =
         static_cast<TestNavigationURLLoader*>(request->loader_for_testing());
     CHECK(url_loader);
     url_loader->SimulateError(error_code);
     return;
   }
 
   FrameHostMsg_DidFailProvisionalLoadWithError_Params error_params;
@@ skipping 262 matching lines @@
         ->SendBeforeUnloadACK(true);
   }
 
   if (!have_to_make_network_request)
     return;  // |request| is destructed by now.
 
   CHECK(request->state() == NavigationRequest::STARTED);
 
   if (!request->loader_for_testing()) {
     base::RunLoop loop;
-    request->set_on_start_checks_complete_closure_for_testing(
-        loop.QuitClosure());
+    request->set_on_checks_complete_callback_for_testing(
+        base::Bind(&CallbackRunner, loop.QuitClosure()));
     loop.Run();
   }
 
   TestNavigationURLLoader* url_loader =
       static_cast<TestNavigationURLLoader*>(request->loader_for_testing());
   CHECK(url_loader);
 
   // If a non-empty |redirect_url| was provided, simulate a server redirect.
   if (!redirect_url.is_empty())
     url_loader->SimulateServerRedirect(redirect_url);
@@ skipping 25 matching lines @@
   // PlzNavigate: NavigationHandle::WillStartRequest has already been called at
   // this point.
   if (!navigation_handle() || IsBrowserSideNavigationEnabled())
     return;
   navigation_handle()->CallWillStartRequestForTesting(
       false /* is_post */, Referrer(GURL(), blink::WebReferrerPolicyDefault),
       true /* user_gesture */, transition, false /* is_external_protocol */);
 }
 
 }  // namespace content