Move infobar handling to a tab helper.

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
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
+#include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
@@ skipping 169 matching lines @@
         type == AutocompleteMatch::SEARCH_HISTORY ||
         type == AutocompleteMatch::SEARCH_SUGGEST) {
       // The user performed a search from the omnibox, don't show the infobar
       // again.
       DisableHint();
     }
   }
 }
 
 void OmniboxSearchHint::ShowInfoBar() {
-  tab_->AddInfoBar(new HintInfoBar(this));
+  tab_->infobar_tab_helper()->AddInfoBar(new HintInfoBar(this));
 }
 
 void OmniboxSearchHint::ShowEnteringQuery() {
   LocationBar* location_bar = BrowserList::GetLastActiveWithProfile(
       tab_->profile())->window()->GetLocationBar();
   OmniboxView* omnibox_view = location_bar->location_entry();
   location_bar->FocusLocation(true);
   omnibox_view->SetUserText(
       l10n_util::GetStringUTF16(IDS_OMNIBOX_SEARCH_HINT_OMNIBOX_TEXT));
   omnibox_view->SelectAll(false);
@@ skipping 12 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);
 }