Fixing race conditions in ui::content::WindowSlider which could cause the overscroll overlay to nev…

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/common/view_messages.h"
 #include "content/public/browser/web_contents_view.h"
@@ skipping 32 matching lines @@
 
   void ReceivePaintUpdate() {
     ViewHostMsg_DidFirstVisuallyNonEmptyPaint msg(
         test_rvh()->GetRoutingID(), 0);
     RenderViewHostTester::TestOnMessageReceived(test_rvh(), msg);
   }
 
   void PerformBackNavigationViaSliderCallbacks() {
     // Sets slide direction to SLIDE_BACK, sets screenshot from NavEntry at
     // offset -1  on layer_delegate_.
-    delete GetOverlay()->CreateBackLayer();
+    delete GetOverlay()->OnSlideBackStartedCreateLayer();
     // Performs BACK navigation, sets image from layer_delegate_ on
     // image_delegate_.
-    GetOverlay()->OnWindowSlideComplete();
+    GetOverlay()->OnWindowSlideCompleting();
+    GetOverlay()->OnWindowSlideCompleted();
   }
 
  protected:
   // RenderViewHostImplTestHarness:
   virtual void SetUp() OVERRIDE {
     RenderViewHostImplTestHarness::SetUp();
 
     const GURL first("https://www.google.com");
     contents()->NavigateAndCommit(first);
     EXPECT_TRUE(controller().GetVisibleEntry());
@@ skipping 160 matching lines @@
   // Navigation was committed and the load update was received - the flag
   // should now be updated.
   EXPECT_TRUE(GetOverlay()->loading_complete_);
 
   EXPECT_TRUE(GetOverlay()->web_contents());
   ReceivePaintUpdate();
   EXPECT_FALSE(GetOverlay()->web_contents());
 }
 
 }  // namespace content