AutocompleteInput::PageClassification -> AutocompleteInput::OmniboxContext.

chrome/browser/autocomplete/search_provider.cc

 // Copyright 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/autocomplete/search_provider.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/callback.h"
@@ skipping 608 matching lines @@
 
 void SearchProvider::DoHistoryQuery(bool minimal_changes) {
   // The history query results are synchronous, so if minimal_changes is true,
   // we still have the last results and don't need to do anything.
   if (minimal_changes)
     return;
 
   keyword_history_results_.clear();
   default_history_results_.clear();
 
-  if (OmniboxFieldTrial::SearchHistoryDisable(
-      input_.current_page_classification()))
+  if (OmniboxFieldTrial::SearchHistoryDisable(input_.omnibox_context()))
     return;
 
   HistoryService* const history_service =
       HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
   history::URLDatabase* url_db = history_service ?
       history_service->InMemoryDatabase() : NULL;
   if (!url_db)
     return;
 
   // Request history for both the keyword and default provider.  We grab many
@@ skipping 553 matching lines @@
 SearchProvider::SuggestResults SearchProvider::ScoreHistoryResults(
     const HistoryResults& results,
     bool base_prevent_inline_autocomplete,
     bool input_multiple_words,
     const string16& input_text,
     bool is_keyword) {
   AutocompleteClassifier* classifier =
       AutocompleteClassifierFactory::GetForProfile(profile_);
   SuggestResults scored_results;
   const bool prevent_search_history_inlining =
-      OmniboxFieldTrial::SearchHistoryPreventInlining(
-          input_.current_page_classification());
+      OmniboxFieldTrial::SearchHistoryPreventInlining(input_.omnibox_context());
   for (HistoryResults::const_iterator i(results.begin()); i != results.end();
        ++i) {
     // Don't autocomplete multi-word queries that have only been seen once
     // unless the user has typed more than one word.
     bool prevent_inline_autocomplete = base_prevent_inline_autocomplete ||
         (!input_multiple_words && (i->visits < 2) && HasMultipleWords(i->term));
 
     // Don't autocomplete search terms that would normally be treated as URLs
     // when typed. For example, if the user searched for "google.com" and types
     // "goog", don't autocomplete to the search term "google.com". Otherwise,
@@ skipping 300 matching lines @@
     it->set_relevance(max_query_relevance);
     it->set_relevance_from_server(relevance_from_server);
   }
 }
 
 void SearchProvider::UpdateDone() {
   // We're done when the timer isn't running, there are no suggest queries
   // pending, and we're not waiting on Instant.
   done_ = !timer_.IsRunning() && (suggest_results_pending_ == 0);
 }