Omnibox: Convert Shortcuts Scoring Field Trial to Omnibox Bundled Field Trial

chrome/browser/autocomplete/shortcuts_provider.h

Index: chrome/browser/autocomplete/shortcuts_provider.h
diff --git a/chrome/browser/autocomplete/shortcuts_provider.h b/chrome/browser/autocomplete/shortcuts_provider.h
index 11f0b0a6b59601aea9a40947cdc858bd08121c72..89dcc3cb06f5a69d3ed1c8bca0950069554bd6b5 100644
--- a/chrome/browser/autocomplete/shortcuts_provider.h
+++ b/chrome/browser/autocomplete/shortcuts_provider.h
@@ -96,17 +96,11 @@ class ShortcutsProvider
 
   int CalculateScore(
       const string16& terms,
-      const history::ShortcutsBackend::Shortcut& shortcut);
+      const history::ShortcutsBackend::Shortcut& shortcut,
+      int max_relevance);
 
   std::string languages_;
   bool initialized_;
-
-  // The maximum relevance that can be assigned in CalculateScore().
-  // Note that if the final assigned relevance is at least
-  // AutocompleteResult::kLowestDefaultScore, the relevance will be
-  // demoted to less than that number because ShortcutsProvider isn't
-  // allowed to inline.
-  int max_relevance_;
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_SHORTCUTS_PROVIDER_H_