Moving common code into OmniboxView from OmniboxView*

chrome/browser/ui/gtk/location_bar_view_gtk.cc

Index: chrome/browser/ui/gtk/location_bar_view_gtk.cc
diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
index 3859e58e77db904c69a158ac2105a184a542a282..86802dc0d1efed02d57076c3ab68be3cad55898d 100644
--- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc
+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
@@ -544,8 +544,8 @@ void LocationBarViewGtk::OnAutocompleteAccept(const GURL& url,
 void LocationBarViewGtk::OnChanged() {
   UpdateSiteTypeArea();
 
-  const string16 keyword(location_entry_->model()->keyword());
-  const bool is_keyword_hint = location_entry_->model()->is_keyword_hint();
+  const string16 keyword(location_entry_->GetModel()->keyword());
+  const bool is_keyword_hint = location_entry_->GetModel()->is_keyword_hint();
   show_selected_keyword_ = !keyword.empty() && !is_keyword_hint;
   show_keyword_hint_ = !keyword.empty() && is_keyword_hint;
 
@@ -679,7 +679,7 @@ void LocationBarViewGtk::ShowFirstRunBubble() {
 
 void LocationBarViewGtk::SetSuggestedText(const string16& text,
                                           InstantCompleteBehavior behavior) {
-  location_entry_->model()->SetSuggestedText(text, behavior);
+  location_entry_->GetModel()->SetSuggestedText(text, behavior);
 }
 
 string16 LocationBarViewGtk::GetInputString() const {
@@ -695,7 +695,7 @@ content::PageTransition LocationBarViewGtk::GetPageTransition() const {
 }
 
 void LocationBarViewGtk::AcceptInput() {
-  location_entry_->model()->AcceptInput(CURRENT_TAB, false);
+  location_entry_->GetModel()->AcceptInput(CURRENT_TAB, false);
 }
 
 void LocationBarViewGtk::FocusLocation(bool select_all) {
@@ -956,8 +956,8 @@ gboolean LocationBarViewGtk::HandleExpose(GtkWidget* widget,
 void LocationBarViewGtk::UpdateSiteTypeArea() {
   // The icon is always visible except when the |tab_to_search_alignment_| is
   // visible.
-  if (!location_entry_->model()->keyword().empty() &&
-      !location_entry_->model()->is_keyword_hint()) {
+  if (!location_entry_->GetModel()->keyword().empty() &&
+      !location_entry_->GetModel()->is_keyword_hint()) {
     gtk_widget_hide(site_type_area());
     return;
   }