Use entry URLs instead of entry IDs to determine when to dismiss the overscroll overlay.

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 "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/web_contents/aura/image_window_delegate.h"
 #include "content/browser/web_contents/web_contents_view.h"
 #include "content/common/frame_messages.h"
@@ skipping 139 matching lines @@
 TEST_F(OverscrollNavigationOverlayTest, MultiNavigation_PaintUpdate) {
   GetOverlay()->image_delegate_->SetImage(CreateDummyScreenshot());
   SetDummyScreenshotOnNavEntry(controller().GetEntryAtOffset(-1));
 
   PerformBackNavigationViaSliderCallbacks();
   // Screenshot was set on NavEntry at offset -1.
   EXPECT_TRUE(GetOverlay()->image_delegate_->has_image());
   EXPECT_FALSE(GetOverlay()->received_paint_update_);
 
   ReceivePaintUpdate();
-  // Paint updates until the navigation is committed represent updates
+  // Paint updates until the navigation is committed typically represent updates
   // for the previous page, so they shouldn't affect the flag.
   EXPECT_FALSE(GetOverlay()->received_paint_update_);
 
   contents()->CommitPendingNavigation();
   ReceivePaintUpdate();
   // Navigation was committed and the paint update was received - the flag
   // should now be updated.
   EXPECT_TRUE(GetOverlay()->received_paint_update_);
 
   EXPECT_FALSE(GetOverlay()->web_contents());
 }
 
 TEST_F(OverscrollNavigationOverlayTest, MultiNavigation_LoadingUpdate) {
   GetOverlay()->image_delegate_->SetImage(CreateDummyScreenshot());
 
   PerformBackNavigationViaSliderCallbacks();
   // No screenshot was set on NavEntry at offset -1.
   EXPECT_FALSE(GetOverlay()->image_delegate_->has_image());
   // Navigation was started, so the loading status flag should be reset.
   EXPECT_FALSE(GetOverlay()->loading_complete_);
 
-  // Load updates until the navigation is committed represent updates for the
-  // previous page, so they shouldn't affect the flag.
+  // 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()->loading_complete_);
-
-  contents()->CommitPendingNavigation();
-  contents()->TestSetIsLoading(true);
-  contents()->TestSetIsLoading(false);
-  // Navigation was committed and the load update was received - the flag
-  // should now be updated.
   EXPECT_TRUE(GetOverlay()->loading_complete_);
 
   EXPECT_FALSE(GetOverlay()->web_contents());
 }
 
 }  // namespace content