overscroll: Take a screenshot at more appropriate times.

content/browser/web_contents/web_contents_view_aura_browsertest.cc

 // Copyright (c) 2012 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/web_contents_view_aura.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
 #include "base/utf_string_conversions.h"
@@ skipping 260 matching lines @@
     DISABLED_OverscrollScreenshot
 #else
 #define MAYBE_OverscrollScreenshot \
     OverscrollScreenshot
 #endif
 // Tests that the page has has a screenshot when navigation happens:
 //  - from within the page (from a JS function)
 //  - interactively, when user does an overscroll gesture
 //  - interactively, when user navigates in history without the overscroll
 //    gesture.
+//  - interactively, by the user navigating to a new page from the UI (e.g.
+//    entering a URL in the omnibox, or navigating to a bookmark)
 IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest,
                        OverscrollScreenshot) {
   ASSERT_NO_FATAL_FAILURE(
       StartTestWithPage("files/overscroll_navigation.html"));
   WebContentsImpl* web_contents =
       static_cast<WebContentsImpl*>(shell()->web_contents());
   RenderViewHostImpl* view_host = static_cast<RenderViewHostImpl*>(
       web_contents->GetRenderViewHost());
 
   // Do a few navigations initiated by the page.
@@ skipping 63 matching lines @@
     string16 expected_title = ASCIIToUTF16("Title: #3");
     content::TitleWatcher title_watcher(web_contents, expected_title);
     web_contents->GetController().GoBack();
     string16 actual_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(expected_title, actual_title);
     EXPECT_EQ(3, GetCurrentIndex());
     entry = NavigationEntryImpl::FromNavigationEntry(
         web_contents->GetController().GetEntryAtIndex(4));
     EXPECT_TRUE(entry->screenshot().get());
   }
+
+  for (int index = 6; index <= 7; ++index) {
+    // Navigate via the user initiating a navigation from the UI.
+    string16 expected_title =
+        ASCIIToUTF16(base::StringPrintf("Title: #%d", index));
+    content::TitleWatcher title_watcher(web_contents, expected_title);
+
+    GURL url(test_server()->GetURL(
+        base::StringPrintf("files/overscroll_navigation.html#%d", index)));

[Charlie Reis, 2013/01/09 00:49:23]

Just curious-- these tests don't appear to be doing a cross-process navigation,
so I'm not sure if they're triggering the bug.  Do they fail without your fix? 
(If so, I wonder what causes it.)

[sadrul, 2013/01/09 17:44:19]

Great catch! You are right. These do not fail without the rest of the changes in
this CL.

I have changed the test to make sure they do fail without the change now. I have
added checks to make sure that screenshot is taken for the correct RV

+    NavigationController::LoadURLParams params(url);
+    params.transition_type = PageTransitionFromInt(
+        PAGE_TRANSITION_TYPED | PAGE_TRANSITION_FROM_ADDRESS_BAR);
+    web_contents->GetController().LoadURLWithParams(params);
+    string16 actual_title = title_watcher.WaitAndGetTitle();
+    EXPECT_EQ(expected_title, actual_title);
+    EXPECT_EQ(index, GetCurrentIndex());
+    entry = NavigationEntryImpl::FromNavigationEntry(
+        web_contents->GetController().GetEntryAtOffset(-1));
+    EXPECT_TRUE(entry->screenshot().get());
+
+    entry = NavigationEntryImpl::FromNavigationEntry(
+        web_contents->GetController().GetActiveEntry());
+    EXPECT_FALSE(entry->screenshot().get());
+  }
+
+  for (int index = 8; index <= 9; ++index) {
+    // Navigate to a bookmark from the UI.
+    string16 expected_title =
+        ASCIIToUTF16(base::StringPrintf("Title: #%d", index));
+    content::TitleWatcher title_watcher(web_contents, expected_title);
+
+    GURL url(test_server()->GetURL(
+        base::StringPrintf("files/overscroll_navigation.html#%d", index)));
+    NavigationController::LoadURLParams params(url);
+    params.transition_type = PageTransitionFromInt(
+        PAGE_TRANSITION_AUTO_BOOKMARK);
+    web_contents->GetController().LoadURLWithParams(params);
+    string16 actual_title = title_watcher.WaitAndGetTitle();
+    EXPECT_EQ(expected_title, actual_title);
+    EXPECT_EQ(index, GetCurrentIndex());
+    entry = NavigationEntryImpl::FromNavigationEntry(
+        web_contents->GetController().GetEntryAtOffset(-1));
+    EXPECT_TRUE(entry->screenshot().get());
+
+    entry = NavigationEntryImpl::FromNavigationEntry(
+        web_contents->GetController().GetActiveEntry());
+    EXPECT_FALSE(entry->screenshot().get());
+  }
 }
 
 }  // namespace content