Don't rely on user gestures for deciding when to dismiss infobars.

Previously, we looked at the user gesture state when deciding whether to
dismiss infobars.  Now that WebKit's user gesture state doesn't lie, we can
tell that this behavior is incorrect.  Page-specific infobars, like translate,
should close whenever the main frame navigates to a new page, regardless of
whether that navigation was conducted from a user gesture.

BUG=86417

Review URL: http://codereview.chromium.org/7205026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89864 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 6 insertions, 32 deletions

diff --git a/content/browser/tab_contents/navigation_controller.cc b/content/browser/tab_contents/navigation_controller.cc
index c4574b7..2455e3f 100644
--- a/content/browser/tab_contents/navigation_controller.cc
+++ b/content/browser/tab_contents/navigation_controller.cc
@@ -560,21 +560,6 @@ bool NavigationController::RendererDidNavigate(
   // The active entry's SiteInstance should match our SiteInstance.
   DCHECK(active_entry->site_instance() == tab_contents_->GetSiteInstance());
 
-  // WebKit doesn't set the "auto" transition on meta refreshes properly (bug
-  // 1051891) so we manually set it for redirects which we normally treat as
-  // "non-user-gestures" where we want to update stuff after navigations.
-  //
-  // Note that the redirect check also checks for a pending entry to
-  // differentiate real redirects from browser initiated navigations to a
-  // redirected entry. This happens when you hit back to go to a page that was
-  // the destination of a redirect, we don't want to treat it as a redirect
-  // even though that's what its transition will be. See bug 1117048.
-  //
-  // TODO(brettw) write a test for this complicated logic.
-  details->is_auto = (PageTransition::IsRedirect(params.transition) &&
-                      !pending_entry()) ||
-      params.gesture == NavigationGestureAuto;
-
   // Now prep the rest of the details for the notification and broadcast.
   details->entry = active_entry;
   details->is_main_frame = PageTransition::IsMainFrame(params.transition);
diff --git a/content/browser/tab_contents/navigation_controller_unittest.cc b/content/browser/tab_contents/navigation_controller_unittest.cc
index 4f82e49..a3a7c7e 100644
--- a/content/browser/tab_contents/navigation_controller_unittest.cc
+++ b/content/browser/tab_contents/navigation_controller_unittest.cc
@@ -1020,7 +1020,6 @@ TEST_F(NavigationControllerTest, NewSubframe) {
   EXPECT_TRUE(notifications.Check1AndReset(
       NotificationType::NAV_ENTRY_COMMITTED));
   EXPECT_EQ(url1, details.previous_url);
-  EXPECT_FALSE(details.is_auto);
   EXPECT_FALSE(details.is_in_page);
   EXPECT_FALSE(details.is_main_frame);
 
diff --git a/content/browser/tab_contents/navigation_details.cc b/content/browser/tab_contents/navigation_details.cc
index 421e86e..ad44208 100644
--- a/content/browser/tab_contents/navigation_details.cc
+++ b/content/browser/tab_contents/navigation_details.cc
@@ -10,7 +10,6 @@ LoadCommittedDetails::LoadCommittedDetails()
     : entry(NULL),
       type(NavigationType::UNKNOWN),
       previous_entry_index(-1),
-      is_auto(false),
       did_replace_entry(false),
       is_in_page(false),
       is_main_frame(true),
diff --git a/content/browser/tab_contents/navigation_details.h b/content/browser/tab_contents/navigation_details.h
index 11448c9..2bb3df3 100644
--- a/content/browser/tab_contents/navigation_details.h
+++ b/content/browser/tab_contents/navigation_details.h
@@ -37,16 +37,8 @@ struct LoadCommittedDetails {
   // The previous URL that the user was on. This may be empty if none.
   GURL previous_url;
 
-  // True when this load was non-user initated. This corresponds to a
-  // a NavigationGestureAuto call from WebKit (see webview_delegate.h).
-  // We also count reloads and meta-refreshes as "auto" to account for the
-  // fact that WebKit doesn't always set the user gesture properly in these
-  // cases (see bug 1051891).
-  bool is_auto;
-
   // True if the committed entry has replaced the exisiting one.
   // A non-user initiated redirect causes such replacement.
-  // This is somewhat similiar to is_auto, but not exactly the same.
   bool did_replace_entry;
 
   // True if the navigation was in-page. This means that the active entry's
@@ -63,12 +55,11 @@ struct LoadCommittedDetails {
   // Use SSLManager::DeserializeSecurityInfo to decode it.
   std::string serialized_security_info;
 
-  // Returns whether the user probably felt like they navigated somewhere new.
-  // We often need this logic for showing or hiding something, and this
-  // returns true only for main frame loads that the user initiated, that go
-  // to a new page.
-  bool is_user_initiated_main_frame_load() const {
-    return !is_auto && !is_in_page && is_main_frame;
+  // Returns whether the main frame navigated to a different page (e.g., not
+  // scrolling to a fragment inside the current page). We often need this logic
+  // for showing or hiding something.
+  bool is_navigation_to_different_page() const {
+    return is_main_frame && !is_in_page;
   }
 
   // The HTTP status code for this entry..
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
index cc80505..200d80f 100644
--- a/content/browser/tab_contents/tab_contents.cc
+++ b/content/browser/tab_contents/tab_contents.cc
@@ -1061,7 +1061,7 @@ void TabContents::DidNavigateMainFramePostCommit(
     opener_web_ui_type_ = WebUI::kNoWebUI;
   }
 
-  if (details.is_user_initiated_main_frame_load()) {
+  if (details.is_navigation_to_different_page()) {
     // Clear the status bubble. This is a workaround for a bug where WebKit
     // doesn't let us know that the cursor left an element during a
     // transition (this is also why the mouse cursor remains as a hand after