PlzNavigate: track pending commits

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 85 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_TRUE(contents()->CrossProcessNavigationPending());
       EXPECT_EQ(GetOverlay()->direction_, OverscrollNavigationOverlay::BACK);
     } else {
-      EXPECT_FALSE(contents()->cross_navigation_pending());
+      EXPECT_FALSE(contents()->CrossProcessNavigationPending());
       EXPECT_EQ(GetOverlay()->direction_, OverscrollNavigationOverlay::NONE);
     }
     window->SetBounds(gfx::Rect(root_window()->bounds().size()));
     GetOverlay()->OnOverscrollCompleted(window.Pass());
   }
 
   gfx::Rect GetFrontSlideWindowBounds() {
     gfx::Rect bounds = gfx::Rect(root_window()->bounds().size());
     bounds.Offset(root_window()->bounds().size().width(), 0);
     return bounds;
@@ skipping 110 matching lines @@
 }
 
 // Tests that if a navigation is cancelled, no navigation is performed and the
 // state is restored.
 TEST_F(OverscrollNavigationOverlayTest, CancelNavigation) {
   scoped_ptr<aura::Window> window =
       GetOverlay()->CreateBackWindow(GetBackSlideWindowBounds());
   EXPECT_EQ(GetOverlay()->direction_, OverscrollNavigationOverlay::BACK);
 
   GetOverlay()->OnOverscrollCancelled();
-  EXPECT_FALSE(contents()->cross_navigation_pending());
+  EXPECT_FALSE(contents()->CrossProcessNavigationPending());
   EXPECT_EQ(GetOverlay()->direction_, OverscrollNavigationOverlay::NONE);
 }
 
 // Performs two navigations. The second navigation is cancelled, tests that the
 // first one worked correctly.
 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());
+  EXPECT_TRUE(contents()->CrossProcessNavigationPending());
   main_test_rfh()->SendNavigate(
       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();
@@ skipping 104 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