PlzNavigate: use the right helper functions in OverscrollNavigationOverlayTests

content/browser/web_contents/aura/overscroll_navigation_overlay_unittest.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/web_contents/aura/overscroll_navigation_overlay.h"
 
 #include <vector>
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/web_contents/web_contents_view.h"
 #include "content/common/frame_messages.h"
@@ skipping 83 matching lines @@
   }
 
   void PerformBackNavigationViaSliderCallbacks() {
     // Sets slide direction to BACK, sets screenshot from NavEntry at
     // offset -1  on layer_delegate_.
     scoped_ptr<aura::Window> window(
         GetOverlay()->CreateBackWindow(GetBackSlideWindowBounds()));
     // Performs BACK navigation, sets image from layer_delegate_ on
     // image_delegate_.
     GetOverlay()->OnOverscrollCompleting();
+    main_test_rfh()->PrepareForCommit();
     if (window) {
       EXPECT_TRUE(contents()->cross_navigation_pending());
       EXPECT_EQ(GetOverlay()->direction_, OverscrollNavigationOverlay::BACK);
     } else {
       EXPECT_FALSE(contents()->cross_navigation_pending());
       EXPECT_EQ(GetOverlay()->direction_, OverscrollNavigationOverlay::NONE);
     }
     window->SetBounds(gfx::Rect(root_window()->bounds().size()));
     GetOverlay()->OnOverscrollCompleted(window.Pass());
   }
@@ skipping 131 matching lines @@
 TEST_F(OverscrollNavigationOverlayTest, CancelAfterSuccessfulNavigation) {
   PerformBackNavigationViaSliderCallbacks();
   scoped_ptr<aura::Window> wrapper =
       GetOverlay()->CreateBackWindow(GetBackSlideWindowBounds());
   EXPECT_EQ(GetOverlay()->direction_, OverscrollNavigationOverlay::BACK);
 
   GetOverlay()->OnOverscrollCancelled();
   EXPECT_EQ(GetOverlay()->direction_, OverscrollNavigationOverlay::NONE);
 
   EXPECT_TRUE(contents()->cross_navigation_pending());
-  contents()->CommitPendingNavigation();
+  main_test_rfh()->SendNavigate(

[nasko, 2015/04/14 16:13:35]

nit: I kinda like the CommitPendingNavigation paradigm, as this test doesn't
really care about how navigation is done, but this CL is likely not the place to
figure out how to make this better.

+      1, contents()->GetController().GetPendingEntry()->GetURL());
   EXPECT_EQ(contents()->GetURL(), third());
 }
 
 // Tests that an overscroll navigation that receives a paint update actually
 // stops observing.
 TEST_F(OverscrollNavigationOverlayTest, Navigation_PaintUpdate) {
   PerformBackNavigationViaSliderCallbacks();
   ReceivePaintUpdate();
 
   // Paint updates until the navigation is committed typically represent updates
   // for the previous page, so we should still be observing.
   EXPECT_TRUE(GetOverlay()->web_contents());
 
-  contents()->CommitPendingNavigation();
+  main_test_rfh()->SendNavigate(
+      1, contents()->GetController().GetPendingEntry()->GetURL());
   ReceivePaintUpdate();
 
   // Navigation was committed and the paint update was received - we should no
   // longer be observing.
   EXPECT_FALSE(GetOverlay()->web_contents());
   EXPECT_EQ(contents()->GetURL(), third());
 }
 
 // Tests that an overscroll navigation that receives a loading update actually
 // stops observing.
 TEST_F(OverscrollNavigationOverlayTest, Navigation_LoadingUpdate) {
   PerformBackNavigationViaSliderCallbacks();
   EXPECT_TRUE(GetOverlay()->web_contents());
   // DidStopLoading for any navigation should always reset the load flag and
   // dismiss the overlay even if the pending navigation wasn't committed -
   // this is a "safety net" in case we mis-identify the destination webpage
   // (which can happen if a new navigation is performed while while a GestureNav
   // navigation is in progress).
   contents()->TestSetIsLoading(true);
   contents()->TestSetIsLoading(false);
   EXPECT_FALSE(GetOverlay()->web_contents());
-  contents()->CommitPendingNavigation();
+  main_test_rfh()->SendNavigate(
+      1, contents()->GetController().GetPendingEntry()->GetURL());
   EXPECT_EQ(contents()->GetURL(), third());
 }
 
 // Tests that swapping the overlay window at the end of a gesture caused by the
 // start of a new overscroll does not crash and the events still reach the new
 // overlay window.
 TEST_F(OverscrollNavigationOverlayTest, OverlayWindowSwap) {
   PerformBackNavigationViaSliderCallbacks();
   aura::Window* first_overlay_window = GetOverlay()->window_.get();
   EXPECT_TRUE(GetOverlay()->web_contents());
@@ skipping 64 matching lines @@
   EXPECT_TRUE(GetOverlay()->window_.get());
 
   // Load the page.
   contents()->CommitPendingNavigation();
   ReceivePaintUpdate();
   EXPECT_FALSE(GetOverlay()->window_.get());
   EXPECT_EQ(contents()->GetURL(), first());
 }
 
 }  // namespace content