AutocompleteInput::PageClassification -> AutocompleteInput::OmniboxContext.

chrome/browser/ui/omnibox/omnibox_edit_model.cc

Index: chrome/browser/ui/omnibox/omnibox_edit_model.cc
diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc
index b4c9087b4507db3a45152c1547ca85c82fa3f0e9..18a06570d05ab92f6ac58697b41278358b0b42cb 100644
--- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc
+++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc
@@ -497,7 +497,7 @@ void OmniboxEditModel::StartAutocomplete(
       user_text_,
       cursor_position,
       current_url,
-      ClassifyPage(),
+      GetOmniboxContext(),
       prevent_inline_autocomplete || just_deleted_text_ ||
       (has_selected_text && inline_autocomplete_text_.empty()) ||
       (paste_state_ != NONE),
@@ -558,7 +558,7 @@ void OmniboxEditModel::AcceptInput(WindowOpenDisposition disposition,
     const AutocompleteInput& old_input = autocomplete_controller()->input();
     AutocompleteInput input(
       old_input.text(), old_input.cursor_position(), ASCIIToUTF16("com"),
-      GURL(), old_input.current_page_classification(),
+      GURL(), old_input.omnibox_context(),
       old_input.prevent_inline_autocomplete(), old_input.prefer_keyword(),
       old_input.allow_exact_keyword_match(), old_input.matches_requested());
     AutocompleteMatch url_match = HistoryURLProvider::SuggestExactInput(
@@ -632,7 +632,7 @@ void OmniboxEditModel::OpenMatch(const AutocompleteMatch& match,
         autocomplete_controller()->input().type(),
         popup_model()->selected_line(),
         -1,  // don't yet know tab ID; set later if appropriate
-        ClassifyPage(),
+        GetOmniboxContext(),
         elapsed_time_since_user_first_modified_omnibox,
         match.inline_autocompletion.length(),
         elapsed_time_since_last_change_to_default_match,
@@ -821,7 +821,7 @@ void OmniboxEditModel::OnSetFocus(bool control_down) {
     // the actual underlying current URL, e.g. if we're on the NTP and the
     // |permanent_text_| is empty.
     autocomplete_controller()->StartZeroSuggest(delegate_->GetURL(),
-                                                ClassifyPage(),
+                                                GetOmniboxContext(),
                                                 permanent_text_);
   }
 
@@ -1271,7 +1271,7 @@ bool OmniboxEditModel::IsSpaceCharForAcceptingKeyword(wchar_t c) {
   }
 }
 
-AutocompleteInput::PageClassification OmniboxEditModel::ClassifyPage() const {
+AutocompleteInput::OmniboxContext OmniboxEditModel::GetOmniboxContext() const {
   if (!delegate_->CurrentPageExists())
     return AutocompleteInput::OTHER;
   if (delegate_->IsInstantNTP()) {