Moving common code into OmniboxView from OmniboxView*

chrome/browser/extensions/api/omnibox/omnibox_apitest.cc

Index: chrome/browser/extensions/api/omnibox/omnibox_apitest.cc
diff --git a/chrome/browser/extensions/api/omnibox/omnibox_apitest.cc b/chrome/browser/extensions/api/omnibox/omnibox_apitest.cc
index 4b4e1db93c8fe5fe07422978f0bcc75e4850484a..3733d32cc8ffe4a5c347f945e61ebd47d918b2cd 100644
--- a/chrome/browser/extensions/api/omnibox/omnibox_apitest.cc
+++ b/chrome/browser/extensions/api/omnibox/omnibox_apitest.cc
@@ -52,8 +52,8 @@ class OmniboxApiTest : public ExtensionApiTest {
   }
 
   AutocompleteController* GetAutocompleteController(Browser* browser) const {
-    return GetLocationBar(browser)->GetLocationEntry()->model()->popup_model()->
-        autocomplete_controller();
+    return GetLocationBar(browser)->GetLocationEntry()->GetModel()->
+        popup_model()->autocomplete_controller();
   }
 
   // TODO(phajdan.jr): Get rid of this wait-in-a-loop pattern.
@@ -194,7 +194,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxApiTest, DISABLED_PopupStaysClosed) {
   OmniboxView* omnibox_view = location_bar->GetLocationEntry();
   AutocompleteController* autocomplete_controller =
       GetAutocompleteController(browser());
-  OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
+  OmniboxPopupModel* popup_model = omnibox_view->GetModel()->popup_model();
 
   // Input a keyword query and wait for suggestions from the extension.
   omnibox_view->OnBeforePossibleChange();