Moving common code into OmniboxView from OmniboxView*

chrome/browser/autocomplete/autocomplete_browsertest.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/path_service.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 36 matching lines @@
 
 }  // namespace
 
 class AutocompleteBrowserTest : public ExtensionBrowserTest {
  protected:
   LocationBar* GetLocationBar() const {
     return browser()->window()->GetLocationBar();
   }
 
   AutocompleteController* GetAutocompleteController() const {
-    return GetLocationBar()->GetLocationEntry()->model()->popup_model()->
+    return GetLocationBar()->GetLocationEntry()->GetModel()->popup_model()->
         autocomplete_controller();
   }
 };
 
 IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, Basic) {
   LocationBar* location_bar = GetLocationBar();
   OmniboxView* location_entry = location_bar->GetLocationEntry();
 
   EXPECT_TRUE(location_bar->GetInputString().empty());
   EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL), location_entry->GetText());
@@ skipping 233 matching lines @@
     EXPECT_TRUE(autocomplete_controller->done());
     const AutocompleteResult& result = autocomplete_controller->result();
     // 'App test' is also a substring of extension 'Packaged App Test'.
     EXPECT_GT(result.size(), 2U) << AutocompleteResultAsString(result);
     AutocompleteMatch match = result.match_at(0);
     EXPECT_EQ(ASCIIToUTF16("App Test"), match.contents);
     EXPECT_EQ(AutocompleteMatch::EXTENSION_APP, match.type);
     EXPECT_FALSE(match.deletable);
   }
 }