Moving common code into OmniboxView from OmniboxView*

chrome/browser/ui/browser_navigator_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 "chrome/browser/ui/browser_navigator_browsertest.h"
 
 #include "base/command_line.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 1148 matching lines @@
   // Navigate to url.
   chrome::NavigateParams p(MakeNavigateParams());
   p.disposition = CURRENT_TAB;
   p.url = url;
   chrome::Navigate(&p);
 
   // Focus the omnibox.
   chrome::FocusLocationBar(browser());
 
   OmniboxEditController* controller =
-      browser()->window()->GetLocationBar()->GetLocationEntry()->model()->
+      browser()->window()->GetLocationBar()->GetLocationEntry()->GetModel()->
           controller();
 
   // Simulate an alt-enter.
   controller->OnAutocompleteAccept(url2, NEW_FOREGROUND_TAB,
                                    content::PAGE_TRANSITION_TYPED, GURL());
 
   // Make sure the second tab is selected.
   EXPECT_EQ(1, browser()->active_index());
 
   // The tab contents should have the focus in the second tab.
@@ skipping 99 matching lines @@
   EXPECT_EQ(browser(), p2.browser);
 
   // We should now have two windows, the browser() provided by the framework and
   // the panel window we opened earlier. The tabbed browser window has 2 tabs.
   EXPECT_EQ(2u, BrowserList::size());
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(1, panel_browser->tab_count());
 }
 
 } // namespace