Moving common code into OmniboxView from OmniboxView*

chrome/browser/ui/omnibox/omnibox_view_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 <stdio.h>
 
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/time.h"
@@ skipping 226 matching lines @@
 
   void WaitForTabOpenOrClose(int expected_tab_count) {
     WaitForTabOpenOrCloseForBrowser(browser(), expected_tab_count);
   }
 
   void WaitForAutocompleteControllerDone() {
     OmniboxView* omnibox_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
 
     AutocompleteController* controller =
-        omnibox_view->model()->autocomplete_controller();
+        omnibox_view->GetModel()->autocomplete_controller();
     ASSERT_TRUE(controller);
 
     if (controller->done())
       return;
 
     content::NotificationRegistrar registrar;
     registrar.Add(this,
                   chrome::NOTIFICATION_AUTOCOMPLETE_CONTROLLER_RESULT_READY,
                   content::Source<AutocompleteController>(controller));
 
@@ skipping 234 matching lines @@
         chrome::NOTIFICATION_BROWSER_CLOSED, content::Source<Browser>(popup)));
 #endif
   }
 
   void BackspaceInKeywordModeTest() {
     OmniboxView* omnibox_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
 
     // Trigger keyword hint mode.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchKeywordKeys));
-    ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->model()->keyword()));
+    ASSERT_TRUE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->GetModel()->keyword()));
 
     // Trigger keyword mode.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0));
-    ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->model()->keyword()));
+    ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->GetModel()->keyword()));
 
     // Backspace without search text should bring back keyword hint mode.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, 0));
-    ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->model()->keyword()));
+    ASSERT_TRUE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->GetModel()->keyword()));
 
     // Trigger keyword mode again.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0));
-    ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->model()->keyword()));
+    ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->GetModel()->keyword()));
 
     // Input something as search text.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys));
 
     // Should stay in keyword mode while deleting search text by pressing
     // backspace.
     for (size_t i = 0; i < arraysize(kSearchText) - 1; ++i) {
       ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, 0));
-      ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
-      ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->model()->keyword()));
+      ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+      ASSERT_EQ(kSearchKeyword,
+                UTF16ToUTF8(omnibox_view->GetModel()->keyword()));
     }
 
     // Input something as search text.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys));
 
     // Move cursor to the beginning of the search text.
 #if defined(OS_MACOSX)
     // Home doesn't work on Mac trybot.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_A, ui::EF_CONTROL_DOWN));
 #else
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_HOME, 0));
 #endif
     // Backspace at the beginning of the search text shall turn off
     // the keyword mode.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, 0));
-    ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(string16(), omnibox_view->model()->keyword());
+    ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_EQ(string16(), omnibox_view->GetModel()->keyword());
     ASSERT_EQ(std::string(kSearchKeyword) + kSearchText,
               UTF16ToUTF8(omnibox_view->GetText()));
   }
 
   void EscapeTest() {
     ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIHistoryURL));
     chrome::FocusLocationBar(browser());
 
     OmniboxView* omnibox_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
 
     string16 old_text = omnibox_view->GetText();
     EXPECT_FALSE(old_text.empty());
     EXPECT_TRUE(omnibox_view->IsSelectAll());
 
     // Delete all text in omnibox.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, 0));
     EXPECT_TRUE(omnibox_view->GetText().empty());
 
     // Escape shall revert the text in omnibox.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_ESCAPE, 0));
     EXPECT_EQ(old_text, omnibox_view->GetText());
     EXPECT_TRUE(omnibox_view->IsSelectAll());
   }
 
   void DesiredTLDTest() {
     OmniboxView* omnibox_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
-    OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
+    OmniboxPopupModel* popup_model = omnibox_view->GetModel()->popup_model();
     ASSERT_TRUE(popup_model);
 
     // Test ctrl-Enter.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kDesiredTLDKeys));
     ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
     ASSERT_TRUE(popup_model->IsOpen());
     // ctrl-Enter triggers desired_tld feature, thus www.bar.com shall be
     // opened.
     ASSERT_TRUE(SendKeyAndWait(browser(), ui::VKEY_RETURN, ui::EF_CONTROL_DOWN,
         content::NOTIFICATION_NAV_ENTRY_COMMITTED,
@@ skipping 11 matching lines @@
     omnibox_view->SetUserText(ASCIIToUTF16(chrome::kChromeUIHistoryURL));
     int tab_count = browser()->tab_count();
     // alt-Enter opens a new tab.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_RETURN, ui::EF_ALT_DOWN));
     ASSERT_NO_FATAL_FAILURE(WaitForTabOpenOrClose(tab_count + 1));
   }
 
   void EnterToSearchTest() {
     OmniboxView* omnibox_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
-    OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
+    OmniboxPopupModel* popup_model = omnibox_view->GetModel()->popup_model();
     ASSERT_TRUE(popup_model);
 
     // Test Enter to search.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys));
     ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
     ASSERT_TRUE(popup_model->IsOpen());
 
     // Check if the default match result is Search Primary Provider.
     ASSERT_EQ(AutocompleteMatch::SEARCH_WHAT_YOU_TYPED,
               popup_model->result().default_match()->type);
@@ skipping 23 matching lines @@
         content::NOTIFICATION_NAV_ENTRY_COMMITTED,
         content::Source<content::NavigationController>(
             &chrome::GetActiveWebContents(browser())->GetController())));
     url = chrome::GetActiveWebContents(browser())->GetURL();
     EXPECT_STREQ(kSearchSingleCharURL, url.spec().c_str());
   }
 
   void EscapeToDefaultMatchTest() {
     OmniboxView* omnibox_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
-    OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
+    OmniboxPopupModel* popup_model = omnibox_view->GetModel()->popup_model();
     ASSERT_TRUE(popup_model);
 
     // Input something to trigger inline autocomplete.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kInlineAutocompleteTextKeys));
     ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
     ASSERT_TRUE(popup_model->IsOpen());
 
     string16 old_text = omnibox_view->GetText();
 
     // Make sure inline autocomplete is triggerred.
@@ skipping 83 matching lines @@
   }
 
   void AcceptKeywordBySpaceTest() {
     OmniboxView* omnibox_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
 
     string16 search_keyword(ASCIIToUTF16(kSearchKeyword));
 
     // Trigger keyword hint mode.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchKeywordKeys));
-    ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+    ASSERT_TRUE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_EQ(search_keyword, omnibox_view->GetModel()->keyword());
     ASSERT_EQ(search_keyword, omnibox_view->GetText());
 
     // Trigger keyword mode by space.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0));
-    ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+    ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_EQ(search_keyword, omnibox_view->GetModel()->keyword());
     ASSERT_TRUE(omnibox_view->GetText().empty());
 
     // Revert to keyword hint mode.
-    omnibox_view->model()->ClearKeyword(string16());
-    ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+    omnibox_view->GetModel()->ClearKeyword(string16());
+    ASSERT_TRUE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_EQ(search_keyword, omnibox_view->GetModel()->keyword());
     ASSERT_EQ(search_keyword, omnibox_view->GetText());
 
     // Keyword should also be accepted by typing an ideographic space.
     omnibox_view->OnBeforePossibleChange();
     omnibox_view->SetWindowTextAndCaretPos(search_keyword +
         WideToUTF16(L"\x3000"), search_keyword.length() + 1, false, false);
     omnibox_view->OnAfterPossibleChange();
-    ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+    ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_EQ(search_keyword, omnibox_view->GetModel()->keyword());
     ASSERT_TRUE(omnibox_view->GetText().empty());
 
     // Revert to keyword hint mode.
-    omnibox_view->model()->ClearKeyword(string16());
-    ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+    omnibox_view->GetModel()->ClearKeyword(string16());
+    ASSERT_TRUE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_EQ(search_keyword, omnibox_view->GetModel()->keyword());
     ASSERT_EQ(search_keyword, omnibox_view->GetText());
 
     // Keyword shouldn't be accepted by pressing space with a trailing
     // whitespace.
     omnibox_view->SetWindowTextAndCaretPos(search_keyword + char16(' '),
         search_keyword.length() + 1, false, false);
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0));
-    ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+    ASSERT_TRUE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_EQ(search_keyword, omnibox_view->GetModel()->keyword());
     ASSERT_EQ(search_keyword + ASCIIToUTF16("  "), omnibox_view->GetText());
 
     // Keyword shouldn't be accepted by deleting the trailing space.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, 0));
-    ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+    ASSERT_TRUE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_EQ(search_keyword, omnibox_view->GetModel()->keyword());
     ASSERT_EQ(search_keyword + char16(' '), omnibox_view->GetText());
 
     // Keyword shouldn't be accepted by pressing space before a trailing space.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0));
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0));
-    ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+    ASSERT_TRUE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_EQ(search_keyword, omnibox_view->GetModel()->keyword());
     ASSERT_EQ(search_keyword + ASCIIToUTF16("  "), omnibox_view->GetText());
 
     // Keyword should be accepted by pressing space in the middle of context and
     // just after the keyword.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, 0));
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_A, 0));
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0));
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0));
-    ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+    ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_EQ(search_keyword, omnibox_view->GetModel()->keyword());
     ASSERT_EQ(ASCIIToUTF16("a "), omnibox_view->GetText());
 
     // Keyword shouldn't be accepted by pasting "foo bar".
     omnibox_view->SetUserText(string16());
-    ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_TRUE(omnibox_view->model()->keyword().empty());
+    ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_TRUE(omnibox_view->GetModel()->keyword().empty());
 
     omnibox_view->OnBeforePossibleChange();
-    omnibox_view->model()->on_paste();
+    omnibox_view->GetModel()->on_paste();
     omnibox_view->SetWindowTextAndCaretPos(search_keyword +
         ASCIIToUTF16(" bar"), search_keyword.length() + 4, false, false);
     omnibox_view->OnAfterPossibleChange();
-    ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_TRUE(omnibox_view->model()->keyword().empty());
+    ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_TRUE(omnibox_view->GetModel()->keyword().empty());
     ASSERT_EQ(search_keyword + ASCIIToUTF16(" bar"), omnibox_view->GetText());
 
     // Keyword shouldn't be accepted for case like: "foo b|ar" -> "foo b |ar".
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0));
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0));
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0));
-    ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_TRUE(omnibox_view->model()->keyword().empty());
+    ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_TRUE(omnibox_view->GetModel()->keyword().empty());
     ASSERT_EQ(search_keyword + ASCIIToUTF16(" b ar"), omnibox_view->GetText());
 
     // Keyword could be accepted by pressing space with a selected range at the
     // end of text.
     omnibox_view->OnBeforePossibleChange();
     omnibox_view->OnInlineAutocompleteTextMaybeChanged(
         search_keyword + ASCIIToUTF16("  "), search_keyword.length());
     omnibox_view->OnAfterPossibleChange();
-    ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+    ASSERT_TRUE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_EQ(search_keyword, omnibox_view->GetModel()->keyword());
     ASSERT_EQ(search_keyword + ASCIIToUTF16("  "), omnibox_view->GetText());
 
     size_t start, end;
     omnibox_view->GetSelectionBounds(&start, &end);
     ASSERT_NE(start, end);
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0));
-    ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+    ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_EQ(search_keyword, omnibox_view->GetModel()->keyword());
     ASSERT_EQ(string16(), omnibox_view->GetText());
 
     // Space should accept keyword even when inline autocomplete is available.
     omnibox_view->SetUserText(string16());
     const TestHistoryEntry kHistoryFoobar = {
       "http://www.foobar.com", "Page foobar", kSearchText, 100, 100, true
     };
 
     // Add a history entry to trigger inline autocomplete when typing "foo".
     ASSERT_NO_FATAL_FAILURE(
         AddHistoryEntry(kHistoryFoobar, Time::Now() - TimeDelta::FromHours(1)));
 
     // Type "foo" to trigger inline autocomplete.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchKeywordKeys));
     ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
-    ASSERT_TRUE(omnibox_view->model()->popup_model()->IsOpen());
+    ASSERT_TRUE(omnibox_view->GetModel()->popup_model()->IsOpen());
     ASSERT_NE(search_keyword, omnibox_view->GetText());
 
     // Keyword hint shouldn't be visible.
-    ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_TRUE(omnibox_view->model()->keyword().empty());
+    ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_TRUE(omnibox_view->GetModel()->keyword().empty());
 
     // Trigger keyword mode by space.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0));
-    ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+    ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_EQ(search_keyword, omnibox_view->GetModel()->keyword());
     ASSERT_TRUE(omnibox_view->GetText().empty());
 
     // Space in the middle of a temporary text, which separates the text into
     // keyword and replacement portions, should trigger keyword mode.
     omnibox_view->SetUserText(string16());
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchKeywordKeys));
     ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
-    OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
+    OmniboxPopupModel* popup_model = omnibox_view->GetModel()->popup_model();
     ASSERT_TRUE(popup_model->IsOpen());
     ASSERT_EQ(ASCIIToUTF16("foobar.com"), omnibox_view->GetText());
-    omnibox_view->model()->OnUpOrDownKeyPressed(1);
-    omnibox_view->model()->OnUpOrDownKeyPressed(-1);
+    omnibox_view->GetModel()->OnUpOrDownKeyPressed(1);
+    omnibox_view->GetModel()->OnUpOrDownKeyPressed(-1);
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0));
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0));
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0));
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0));
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0));
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0));
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0));
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0));
-    ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+    ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_EQ(search_keyword, omnibox_view->GetModel()->keyword());
     ASSERT_EQ(ASCIIToUTF16("bar.com"), omnibox_view->GetText());
 
     // Space after temporary text that looks like a keyword, when the original
     // input does not look like a keyword, should trigger keyword mode.
     omnibox_view->SetUserText(string16());
     const TestHistoryEntry kHistoryFoo = {
       "http://footest.com", "Page footest", kSearchText, 1000, 1000, true
     };
 
     // Add a history entry to trigger HQP matching with text == keyword when
     // typing "fo te".
     ASSERT_NO_FATAL_FAILURE(
         AddHistoryEntry(kHistoryFoo, Time::Now() - TimeDelta::FromMinutes(10)));
 
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_F, 0));
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_O, 0));
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0));
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_T, 0));
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_E, 0));
     ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
     ASSERT_TRUE(popup_model->IsOpen());
     string16 search_keyword2(ASCIIToUTF16(kSearchKeyword2));
     while ((omnibox_view->GetText() != search_keyword2) &&
            (popup_model->selected_line() < popup_model->result().size() - 1))
-      omnibox_view->model()->OnUpOrDownKeyPressed(1);
+      omnibox_view->GetModel()->OnUpOrDownKeyPressed(1);
     ASSERT_EQ(search_keyword2, omnibox_view->GetText());
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0));
-    ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(search_keyword2, omnibox_view->model()->keyword());
+    ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_EQ(search_keyword2, omnibox_view->GetModel()->keyword());
     ASSERT_TRUE(omnibox_view->GetText().empty());
   }
 
   void NonSubstitutingKeywordTest() {
     OmniboxView* omnibox_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
-    OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
+    OmniboxPopupModel* popup_model = omnibox_view->GetModel()->popup_model();
     ASSERT_TRUE(popup_model);
 
     Profile* profile = browser()->profile();
     TemplateURLService* template_url_service =
         TemplateURLServiceFactory::GetForProfile(profile);
 
     // Add a non-default substituting keyword.
     TemplateURLData data;
     data.short_name = ASCIIToUTF16("Search abc");
     data.SetKeyword(ASCIIToUTF16(kSearchText));
@@ skipping 40 matching lines @@
     TemplateURLService* model =
         TemplateURLServiceFactory::GetForProfile(browser()->profile());
     model->SetDefaultSearchProvider(NULL);
 
     ui_test_utils::NavigateToURL(browser(), GURL(chrome::kAboutBlankURL));
     chrome::FocusLocationBar(browser());
 
     OmniboxView* omnibox_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
 
-    OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
+    OmniboxPopupModel* popup_model = omnibox_view->GetModel()->popup_model();
     ASSERT_TRUE(popup_model);
 
     string16 old_text = omnibox_view->GetText();
 
     // Input something that can match history items.
     omnibox_view->SetUserText(ASCIIToUTF16("bar"));
     ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
     ASSERT_TRUE(popup_model->IsOpen());
 
     // Delete the inline autocomplete part.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_DELETE, 0));
     ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
     ASSERT_TRUE(popup_model->IsOpen());
     ASSERT_GE(popup_model->result().size(), 3U);
 
     string16 user_text = omnibox_view->GetText();
     ASSERT_EQ(ASCIIToUTF16("bar"), user_text);
     omnibox_view->SelectAll(true);
     ASSERT_TRUE(omnibox_view->IsSelectAll());
 
     // The first item should be the default match.
     size_t default_line = popup_model->selected_line();
     std::string default_url =
         popup_model->result().match_at(default_line).destination_url.spec();
 
     // Move down.
-    omnibox_view->model()->OnUpOrDownKeyPressed(1);
+    omnibox_view->GetModel()->OnUpOrDownKeyPressed(1);
     ASSERT_EQ(default_line + 1, popup_model->selected_line());
     string16 selected_text =
         popup_model->result().match_at(default_line + 1).fill_into_edit;
     // Temporary text is shown.
     ASSERT_EQ(selected_text, omnibox_view->GetText());
     ASSERT_FALSE(omnibox_view->IsSelectAll());
 
     // Delete the item.
     popup_model->TryDeletingCurrentItem();
     ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
     // The selected line shouldn't be changed, because we have more than two
     // items.
     ASSERT_EQ(default_line + 1, popup_model->selected_line());
     // Make sure the item is really deleted.
     ASSERT_NE(selected_text,
               popup_model->result().match_at(default_line + 1).fill_into_edit);
     selected_text =
         popup_model->result().match_at(default_line + 1).fill_into_edit;
     // New temporary text is shown.
     ASSERT_EQ(selected_text, omnibox_view->GetText());
 
     // Revert to the default match.
-    ASSERT_TRUE(omnibox_view->model()->OnEscapeKeyPressed());
+    ASSERT_TRUE(omnibox_view->GetModel()->OnEscapeKeyPressed());
     ASSERT_EQ(default_line, popup_model->selected_line());
     ASSERT_EQ(user_text, omnibox_view->GetText());
     ASSERT_TRUE(omnibox_view->IsSelectAll());
 
     // Move down and up to select the default match as temporary text.
-    omnibox_view->model()->OnUpOrDownKeyPressed(1);
+    omnibox_view->GetModel()->OnUpOrDownKeyPressed(1);
     ASSERT_EQ(default_line + 1, popup_model->selected_line());
-    omnibox_view->model()->OnUpOrDownKeyPressed(-1);
+    omnibox_view->GetModel()->OnUpOrDownKeyPressed(-1);
     ASSERT_EQ(default_line, popup_model->selected_line());
 
     selected_text = popup_model->result().match_at(default_line).fill_into_edit;
     // New temporary text is shown.
     ASSERT_EQ(selected_text, omnibox_view->GetText());
     ASSERT_FALSE(omnibox_view->IsSelectAll());
 
 #if 0
     // TODO(mrossetti): http://crbug.com/82335
     // Delete the default item.
     popup_model->TryDeletingCurrentItem();
     ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
     // The selected line shouldn't be changed, but the default item should have
     // been changed.
     ASSERT_EQ(default_line, popup_model->selected_line());
     // Make sure the item is really deleted.
     EXPECT_NE(selected_text,
               popup_model->result().match_at(default_line).fill_into_edit);
     selected_text =
         popup_model->result().match_at(default_line).fill_into_edit;
     // New temporary text is shown.
     ASSERT_EQ(selected_text, omnibox_view->GetText());
 #endif
 
     // As the current selected item is the new default item, pressing Escape key
     // should revert all directly.
-    ASSERT_TRUE(omnibox_view->model()->OnEscapeKeyPressed());
+    ASSERT_TRUE(omnibox_view->GetModel()->OnEscapeKeyPressed());
     ASSERT_EQ(old_text, omnibox_view->GetText());
     ASSERT_TRUE(omnibox_view->IsSelectAll());
   }
 
   void TabAcceptKeyword() {
     OmniboxView* omnibox_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
 
     string16 text = ASCIIToUTF16(kSearchKeyword);
 
     // Trigger keyword hint mode.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchKeywordKeys));
-    ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(text, omnibox_view->model()->keyword());
+    ASSERT_TRUE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_EQ(text, omnibox_view->GetModel()->keyword());
     ASSERT_EQ(text, omnibox_view->GetText());
 
     // Trigger keyword mode by tab.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0));
-    ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(text, omnibox_view->model()->keyword());
+    ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_EQ(text, omnibox_view->GetModel()->keyword());
     ASSERT_TRUE(omnibox_view->GetText().empty());
 
     // Revert to keyword hint mode.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, 0));
-    ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(text, omnibox_view->model()->keyword());
+    ASSERT_TRUE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_EQ(text, omnibox_view->GetModel()->keyword());
     ASSERT_EQ(text, omnibox_view->GetText());
 
     // The location bar should still have focus.
     ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(),
                                              location_bar_focus_view_id_));
 
     // Trigger keyword mode by tab.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0));
-    ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(text, omnibox_view->model()->keyword());
+    ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_EQ(text, omnibox_view->GetModel()->keyword());
     ASSERT_TRUE(omnibox_view->GetText().empty());
 
     // Revert to keyword hint mode with SHIFT+TAB.
 #if defined(OS_MACOSX)
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACKTAB, 0));
 #else
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, ui::EF_SHIFT_DOWN));
 #endif
-    ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(text, omnibox_view->model()->keyword());
+    ASSERT_TRUE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_EQ(text, omnibox_view->GetModel()->keyword());
     ASSERT_EQ(text, omnibox_view->GetText());
 
     ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(),
                                              location_bar_focus_view_id_));
   }
 
   void TabTraverseResultsTest() {
     OmniboxView* omnibox_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
-    OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
+    OmniboxPopupModel* popup_model = omnibox_view->GetModel()->popup_model();
     ASSERT_TRUE(popup_model);
 
     // Input something to trigger results.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kDesiredTLDKeys));
     ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
     ASSERT_TRUE(popup_model->IsOpen());
 
     size_t old_selected_line = popup_model->selected_line();
     EXPECT_EQ(0U, old_selected_line);
 
@@ skipping 33 matching lines @@
         AddHistoryEntry(kHistoryFoo, Time::Now() - TimeDelta::FromHours(1)));
 
     // Load results.
     ASSERT_NO_FATAL_FAILURE(omnibox_view->SelectAll(false));
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchKeywordKeys));
     ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
 
     // Trigger keyword mode by tab.
     string16 text = ASCIIToUTF16(kSearchKeyword);
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0));
-    ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(text, omnibox_view->model()->keyword());
+    ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_EQ(text, omnibox_view->GetModel()->keyword());
     ASSERT_TRUE(omnibox_view->GetText().empty());
 
     // The location bar should still have focus.
     ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(),
                                              location_bar_focus_view_id_));
 
     // Pressing tab again should move to the next result and clear keyword
     // mode.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0));
-    ASSERT_EQ(1U, omnibox_view->model()->popup_model()->selected_line());
-    ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_NE(text, omnibox_view->model()->keyword());
+    ASSERT_EQ(1U, omnibox_view->GetModel()->popup_model()->selected_line());
+    ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_NE(text, omnibox_view->GetModel()->keyword());
 
     // The location bar should still have focus.
     ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(),
                                              location_bar_focus_view_id_));
 
     // Moving back up should not show keyword mode.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, ui::EF_SHIFT_DOWN));
-    ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(text, omnibox_view->model()->keyword());
+    ASSERT_TRUE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_EQ(text, omnibox_view->GetModel()->keyword());
 
     ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(),
                                              location_bar_focus_view_id_));
   }
 
   void PersistKeywordModeOnTabSwitch() {
     OmniboxView* omnibox_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
 
     // Trigger keyword hint mode.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchKeywordKeys));
-    ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->model()->keyword()));
+    ASSERT_TRUE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->GetModel()->keyword()));
 
     // Trigger keyword mode.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0));
-    ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->model()->keyword()));
+    ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+    ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->GetModel()->keyword()));
 
     // Input something as search text.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys));
 
     // Create a new tab.
     chrome::NewTab(browser());
 
     // Switch back to the first tab.
     chrome::ActivateTabAt(browser(), 0, true);
 
     // Make sure we're still in keyword mode.
-    ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->model()->keyword()));
+    ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->GetModel()->keyword()));
   }
 
   void CtrlKeyPressedWithInlineAutocompleteTest() {
     OmniboxView* omnibox_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
-    OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
+    OmniboxPopupModel* popup_model = omnibox_view->GetModel()->popup_model();
     ASSERT_TRUE(popup_model);
 
     // Input something to trigger inline autocomplete.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kInlineAutocompleteTextKeys));
     ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
     ASSERT_TRUE(popup_model->IsOpen());
 
     string16 old_text = omnibox_view->GetText();
 
     // Make sure inline autocomplete is triggerred.
     EXPECT_GT(old_text.length(), arraysize(kInlineAutocompleteText) - 1);
 
     // Press ctrl key.
-    omnibox_view->model()->OnControlKeyChanged(true);
+    omnibox_view->GetModel()->OnControlKeyChanged(true);
 
     // Inline autocomplete should still be there.
     EXPECT_EQ(old_text, omnibox_view->GetText());
   }
 
 #if defined(USE_AURA)
   const BrowserView* GetBrowserView() const {
     return static_cast<BrowserView*>(browser()->window());
   }
 
@@ skipping 311 matching lines @@
 #if defined(OS_LINUX)
 #define MAYBE_PasteReplacingAll DISABLED_PasteReplacingAll
 #else
 #define MAYBE_PasteReplacingAll PasteReplacingAll
 #endif
 
 // http://crbug.com/12316
 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_PasteReplacingAll) {
   OmniboxView* omnibox_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
-  OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
+  OmniboxPopupModel* popup_model = omnibox_view->GetModel()->popup_model();
   ASSERT_TRUE(popup_model);
 
   SetClipboardText(kSearchText);
 
   // Paste text.
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_V, ui::EF_CONTROL_DOWN));
   ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
   ASSERT_TRUE(popup_model->IsOpen());
 
   // Inline autocomplete shouldn't be triggered.
@@ skipping 56 matching lines @@
 
   // Middle-clicking shouldn't select all the text either.
   ASSERT_NO_FATAL_FAILURE(
       ClickFocusViewOrigin(ui_controls::LEFT, kClickOffset, kClickOffset));
   ASSERT_NO_FATAL_FAILURE(ClickBrowserWindowCenter());
   ASSERT_NO_FATAL_FAILURE(
       ClickFocusViewOrigin(ui_controls::MIDDLE, kClickOffset, kClickOffset));
   EXPECT_FALSE(omnibox_view->IsSelectAll());
 }
 #endif  // defined(USE_AURA)