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

chrome/browser/omnibox_search_hint.cc

 // Copyright (c) 2011 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 "chrome/browser/omnibox_search_hint.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/task.h"
 // TODO(avi): remove when conversions not needed any more
@@ skipping 84 matching lines @@
       8000);  // 8 seconds.
 }
 
 HintInfoBar::~HintInfoBar() {
   if (!action_taken_)
     UMA_HISTOGRAM_COUNTS("OmniboxSearchHint.Ignored", 1);
 }
 
 bool HintInfoBar::ShouldExpire(
     const content::LoadCommittedDetails& details) const {
-  return details.is_navigation_to_different_page() && should_expire_;
+  return details.is_user_initiated_main_frame_load() && should_expire_;
 }
 
 void HintInfoBar::InfoBarDismissed() {
   action_taken_ = true;
   UMA_HISTOGRAM_COUNTS("OmniboxSearchHint.Closed", 1);
   // User closed the infobar, let's not bug him again with this in the future.
   omnibox_hint_->DisableHint();
 }
 
 gfx::Image* HintInfoBar::GetIcon() const {
@@ skipping 110 matching lines @@
 }
 
 // static
 bool OmniboxSearchHint::IsEnabled(Profile* profile) {
   // The infobar can only be shown if the correct switch has been provided and
   // the user did not dismiss the infobar before.
   return profile->GetPrefs()->GetBoolean(prefs::kShowOmniboxSearchHint) &&
       CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kSearchInOmniboxHint);
 }