Moving common code into OmniboxView from OmniboxView*

chrome/browser/omnibox_search_hint.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 "chrome/browser/omnibox_search_hint.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
@@ skipping 203 matching lines @@
 void OmniboxSearchHint::ShowEnteringQuery() {
   LocationBar* location_bar = browser::FindBrowserWithWebContents(
       tab_->web_contents())->window()->GetLocationBar();
   OmniboxView* omnibox_view = location_bar->GetLocationEntry();
   location_bar->FocusLocation(true);
   omnibox_view->SetUserText(
       l10n_util::GetStringUTF16(IDS_OMNIBOX_SEARCH_HINT_OMNIBOX_TEXT));
   omnibox_view->SelectAll(false);
   // Entering text in the omnibox view triggers the suggestion popup that we
   // don't want to show in this case.
-  omnibox_view->ClosePopup();
+  omnibox_view->CloseOmniboxPopup();
 }
 
 void OmniboxSearchHint::DisableHint() {
   // The NAV_ENTRY_COMMITTED notification was needed to show the infobar, the
   // OMNIBOX_OPENED_URL notification was there to set the kShowOmniboxSearchHint
   // prefs to false, none of them are needed anymore.
   notification_registrar_.RemoveAll();
   tab_->profile()->GetPrefs()->SetBoolean(prefs::kShowOmniboxSearchHint,
                                           false);
 }
 
 // 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);
 }