Omnibox: Create Bundled Field Trial; Convert SearchHistory trial to it

chrome/browser/autocomplete/search_provider.cc

Index: chrome/browser/autocomplete/search_provider.cc
diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc
index 89d29257b45d18355f036406f556a99ad4426500..eea99d92d357a72f338db3eb9037bd024c959938 100644
--- a/chrome/browser/autocomplete/search_provider.cc
+++ b/chrome/browser/autocomplete/search_provider.cc
@@ -252,10 +252,8 @@ SearchProvider::SearchProvider(AutocompleteProviderListener* listener,
       field_trial_triggered_(false),
       field_trial_triggered_in_session_(false),
       omnibox_start_margin_(-1),
-      prevent_search_history_inlining_(
-          OmniboxFieldTrial::SearchHistoryPreventInlining()),
-      disable_search_history_(
-          OmniboxFieldTrial::SearchHistoryDisable()) {
+      prevent_search_history_inlining_(false),
+      disable_search_history_(false) {
 }
 
 // static
@@ -523,6 +521,11 @@ void SearchProvider::Start(const AutocompleteInput& input,
   }
 
   input_ = input;
+  prevent_search_history_inlining_ =
+      OmniboxFieldTrial::SearchHistoryPreventInlining(
+          input_.current_page_classification());
+  disable_search_history_ = OmniboxFieldTrial::SearchHistoryDisable(
+      input_.current_page_classification());
 
   DoHistoryQuery(minimal_changes);
   StartOrStopSuggestQuery(minimal_changes);