Convert OverscrollNavigationOverlayTest.ImmediateLoadOnNavigate to use the new navigation callbacks…

content/browser/frame_host/navigation_request.cc

 // Copyright 2014 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/navigation_request.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "content/browser/appcache/appcache_navigation_handle.h"
@@ skipping 363 matching lines @@
   NavigatorImpl::CheckWebUIRendererDoesNotDisplayNormalURL(render_frame_host,
                                                            common_params_.url);
 
   // Inform the NavigationHandle that the navigation will commit.
   navigation_handle_->ReadyToCommitNavigation(render_frame_host);
 
   CommitNavigation();
 }
 
 void NavigationRequest::CreateNavigationHandle(int pending_nav_entry_id) {
+  DCHECK_EQ(frame_tree_node_->navigation_request(), this);
   // TODO(nasko): Update the NavigationHandle creation to ensure that the
   // proper values are specified for is_same_page.
-  navigation_handle_ = NavigationHandleImpl::Create(
-      common_params_.url, frame_tree_node_, !browser_initiated_,
-      false,  // is_same_page
-      common_params_.navigation_start, pending_nav_entry_id,
-      false);  // started_in_context_menu
+  FrameTreeNode* frame_tree_node = frame_tree_node_;
+  std::unique_ptr<NavigationHandleImpl> navigation_handle =
+      NavigationHandleImpl::Create(
+        common_params_.url, frame_tree_node_, !browser_initiated_,
+        false,  // is_same_page
+        common_params_.navigation_start, pending_nav_entry_id,
+        false);  // started_in_context_menu
+
+  if (!frame_tree_node->navigation_request()) {
+    // A callback could have cancelled this request synchronously in which case
+    // |this| is deleted.
+    return;
+  }
+
+  navigation_handle_ = std::move(navigation_handle);
 
   if (!begin_params_.searchable_form_url.is_empty()) {
     navigation_handle_->set_searchable_form_url(
         begin_params_.searchable_form_url);
     navigation_handle_->set_searchable_form_encoding(
         begin_params_.searchable_form_encoding);
   }
 }
 
 void NavigationRequest::TransferNavigationHandleOwnership(
@@ skipping 312 matching lines @@
   DCHECK_EQ(request_params_.has_user_gesture, begin_params_.has_user_gesture);
 
   render_frame_host->CommitNavigation(response_.get(), std::move(body_),
                                       common_params_, request_params_,
                                       is_view_source_);
 
   frame_tree_node_->ResetNavigationRequest(true);
 }
 
 }  // namespace content