Omnibox: Make the Controller Reorder Matches for Inlining

chrome/browser/autocomplete/shortcuts_provider.cc

Index: chrome/browser/autocomplete/shortcuts_provider.cc
diff --git a/chrome/browser/autocomplete/shortcuts_provider.cc b/chrome/browser/autocomplete/shortcuts_provider.cc
index cf121be0bd3a49eefebb8635c947d4decd04ccb9..b6e6da1157ee240795f6eb249e921c7302f99dd8 100644
--- a/chrome/browser/autocomplete/shortcuts_provider.cc
+++ b/chrome/browser/autocomplete/shortcuts_provider.cc
@@ -55,7 +55,9 @@ ShortcutsProvider::ShortcutsProvider(AutocompleteProviderListener* listener,
           AutocompleteProvider::TYPE_SHORTCUTS),
       languages_(profile_->GetPrefs()->GetString(prefs::kAcceptLanguages)),
       initialized_(false),
-      max_relevance_(AutocompleteResult::kLowestDefaultScore - 1) {
+      max_relevance_(AutocompleteResult::kLowestDefaultScore - 1),
+      omnibox_will_reorder_for_inlining_(
+         OmniboxFieldTrial::InReorderForInliningGroup()) {
   scoped_refptr<history::ShortcutsBackend> backend =
       ShortcutsBackendFactory::GetForProfile(profile_);
   if (backend.get()) {
@@ -177,12 +179,15 @@ void ShortcutsProvider::GetMatches(const AutocompleteInput& input) {
   // Reset relevance scores to guarantee no results are given an
   // inlineable score and all scores are decreasing (but not do assign
   // any scores below 1).
-  int max_relevance = AutocompleteResult::kLowestDefaultScore - 1;
-  for (ACMatches::iterator it = matches_.begin(); it != matches_.end(); ++it) {
-    max_relevance = std::min(max_relevance, it->relevance);
-    it->relevance = max_relevance;
-    if (max_relevance > 1)
-      --max_relevance;
+  if (!omnibox_will_reorder_for_inlining_) {
+    int max_relevance = AutocompleteResult::kLowestDefaultScore - 1;
+    for (ACMatches::iterator it = matches_.begin(); it != matches_.end();
+        ++it) {
+      max_relevance = std::min(max_relevance, it->relevance);
+      it->relevance = max_relevance;
+      if (max_relevance > 1)
+        --max_relevance;
+    }
   }
 }