Moving common code into OmniboxView from OmniboxView*

chrome/browser/extensions/api/omnibox/omnibox_apitest.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 "base/format_macros.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
@@ skipping 34 matching lines @@
 
 }  // namespace
 
 class OmniboxApiTest : public ExtensionApiTest {
  protected:
   LocationBar* GetLocationBar(Browser* browser) const {
     return browser->window()->GetLocationBar();
   }
 
   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.
   void WaitForAutocompleteDone(AutocompleteController* controller) {
     while (!controller->done()) {
       content::WindowedNotificationObserver ready_observer(
           chrome::NOTIFICATION_AUTOCOMPLETE_CONTROLLER_RESULT_READY,
           content::Source<AutocompleteController>(controller));
       ready_observer.Wait();
     }
@@ skipping 120 matching lines @@
 
   // The results depend on the TemplateURLService being loaded. Make sure it is
   // loaded so that the autocomplete results are consistent.
   ui_test_utils::WaitForTemplateURLServiceToLoad(
       TemplateURLServiceFactory::GetForProfile(browser()->profile()));
 
   LocationBar* location_bar = GetLocationBar(browser());
   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();
   omnibox_view->SetUserText(ASCIIToUTF16("keyword comman"));
   omnibox_view->OnAfterPossibleChange();
   WaitForAutocompleteDone(autocomplete_controller);
   EXPECT_TRUE(autocomplete_controller->done());
   EXPECT_TRUE(popup_model->IsOpen());
 
   // Quickly type another query and accept it before getting suggestions back
@@ skipping 64 matching lines @@
   // incognito context.
   {
     ResultCatcher catcher;
     autocomplete_controller->Start(
         ASCIIToUTF16("keyword command incognito"), string16(),
         true, false, true, AutocompleteInput::ALL_MATCHES);
     location_bar->AcceptInput();
     EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
   }
 }