Moving common code into OmniboxView from OmniboxView*

chrome/browser/instant/instant_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/command_line.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/instant/instant_controller.h"
@@ skipping 441 matching lines @@
   EnableInstant();
   SetupInstantProvider("instant.html");
   DetermineInstantSupport();
 
   ASSERT_TRUE(SetSuggestionsJavascriptArgument(
       "{suggestions:[{value:'defg'}],complete_behavior:'never'}"));
   SearchAndWaitForPreviewToShow();
   EXPECT_EQ("defg", GetSuggestion());
 
   EXPECT_EQ(INSTANT_COMPLETE_NEVER,
-            omnibox()->model()->instant_complete_behavior());
+            omnibox()->GetModel()->instant_complete_behavior());
   EXPECT_EQ("def", UTF16ToUTF8(omnibox()->GetText()));
 }
 
 IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE(InstantCompleteDelayed)) {
   ASSERT_TRUE(test_server()->Start());
   EnableInstant();
   SetupInstantProvider("instant.html");
   DetermineInstantSupport();
 
   ASSERT_TRUE(SetSuggestionsJavascriptArgument(
       "{suggestions:[{value:'defg'}],complete_behavior:'delayed'}"));
   SearchAndWaitForPreviewToShow();
   EXPECT_EQ("defg", GetSuggestion());
 
   EXPECT_EQ(INSTANT_COMPLETE_DELAYED,
-            omnibox()->model()->instant_complete_behavior());
+            omnibox()->GetModel()->instant_complete_behavior());
   EXPECT_EQ("def", UTF16ToUTF8(omnibox()->GetText()));
 }
 
 IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE(InstantCompleteNow)) {
   ASSERT_TRUE(test_server()->Start());
   EnableInstant();
   SetupInstantProvider("instant.html");
   DetermineInstantSupport();
 
   ASSERT_TRUE(SetSuggestionsJavascriptArgument(
       "{suggestions:[{value:'defg'}],complete_behavior:'now'}"));
   SearchAndWaitForPreviewToShow();
   EXPECT_EQ("defg", GetSuggestion());
 
   EXPECT_EQ(INSTANT_COMPLETE_NOW,
-            omnibox()->model()->instant_complete_behavior());
+            omnibox()->GetModel()->instant_complete_behavior());
   EXPECT_EQ("defg", UTF16ToUTF8(omnibox()->GetText()));
 }
 
 // Verifies that instant previews aren't shown for crash URLs.
 IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE(CrashUrlCancelsInstant)) {
   ASSERT_TRUE(test_server()->Start());
   EnableInstant();
   SetupInstantProvider("instant.html");
 
   omnibox()->SetUserText(ASCIIToUTF16(chrome::kChromeUICrashURL));
@@ skipping 330 matching lines @@
   DetermineInstantSupport();
   SearchAndWaitForPreviewToShow();
 
   // Now there should be three rows, the third being the instant preview.
   TaskManagerBrowserTestUtil::WaitForResourceChange(3);
   string16 prefix = l10n_util::GetStringFUTF16(
       IDS_TASK_MANAGER_INSTANT_PREVIEW_PREFIX, string16());
   string16 title = task_manager->GetResourceTitle(2);
   EXPECT_TRUE(StartsWith(title, prefix, true)) << title << " vs " << prefix;
 }