Moving common code into OmniboxView from OmniboxView*

chrome/browser/automation/testing_automation_provider.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/automation/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 3113 matching lines @@
                                                IPC::Message* reply_message) {
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
   AutomationJSONReply reply(this, reply_message);
 
   LocationBar* loc_bar = browser->window()->GetLocationBar();
   if (!loc_bar) {
     reply.SendError("The specified browser does not have a location bar.");
     return;
   }
   const OmniboxView* omnibox_view = loc_bar->GetLocationEntry();
-  const OmniboxEditModel* model = omnibox_view->model();
+  const OmniboxEditModel* model = omnibox_view->GetModel();
 
   // Fill up matches.
   ListValue* matches = new ListValue;
   const AutocompleteResult& result = model->result();
   for (AutocompleteResult::const_iterator i(result.begin()); i != result.end();
        ++i) {
     const AutocompleteMatch& match = *i;
     DictionaryValue* item = new DictionaryValue;  // owned by return_value
     item->SetString("type", AutocompleteMatch::TypeToString(match.type));
     item->SetBoolean("starred", match.starred);
@@ skipping 27 matching lines @@
     reply.SendError("text missing");
     return;
   }
   chrome::FocusLocationBar(browser);
   LocationBar* loc_bar = browser->window()->GetLocationBar();
   if (!loc_bar) {
     reply.SendError("The specified browser does not have a location bar.");
     return;
   }
   OmniboxView* omnibox_view = loc_bar->GetLocationEntry();
-  omnibox_view->model()->OnSetFocus(false);
+  omnibox_view->GetModel()->OnSetFocus(false);
   omnibox_view->SetUserText(text);
   reply.SendSuccess(NULL);
 }
 
 // Sample json input: { "command": "OmniboxMovePopupSelection",
 //                      "count": 1 }
 // Negative count implies up, positive implies down. Count values will be
 // capped by the size of the popup list.
 void TestingAutomationProvider::OmniboxMovePopupSelection(
     Browser* browser,
     DictionaryValue* args,
     IPC::Message* reply_message) {
   int count;
   AutomationJSONReply reply(this, reply_message);
   if (!args->GetInteger("count", &count)) {
     reply.SendError("count missing");
     return;
   }
   LocationBar* loc_bar = browser->window()->GetLocationBar();
   if (!loc_bar) {
     reply.SendError("The specified browser does not have a location bar.");
     return;
   }
-  OmniboxEditModel* model = loc_bar->GetLocationEntry()->model();
+  OmniboxEditModel* model = loc_bar->GetLocationEntry()->GetModel();
   model->OnUpOrDownKeyPressed(count);
   reply.SendSuccess(NULL);
 }
 
 // Sample json input: { "command": "OmniboxAcceptInput" }
 void TestingAutomationProvider::OmniboxAcceptInput(
     Browser* browser,
     DictionaryValue* args,
     IPC::Message* reply_message) {
   NavigationController& controller =
@@ skipping 3687 matching lines @@
 void TestingAutomationProvider::OnRemoveProvider() {
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }
 
 void TestingAutomationProvider::EnsureTabSelected(Browser* browser,
                                                   WebContents* tab) {
   if (chrome::GetActiveWebContents(browser) != tab)
     chrome::ActivateTabAt(browser, chrome::GetIndexOfTab(browser, tab), true);
 }