Revert of Revert of [AiS] Merge answers into highest-scoring result

components/omnibox/base_search_provider.cc

Index: components/omnibox/base_search_provider.cc
diff --git a/components/omnibox/base_search_provider.cc b/components/omnibox/base_search_provider.cc
index 76792e5b816f47456a77f92b5ee46892cc1f8cf3..4e199308528ec64dd471b435cd98ab304023b6e7 100644
--- a/components/omnibox/base_search_provider.cc
+++ b/components/omnibox/base_search_provider.cc
@@ -420,6 +420,17 @@
           i.first->second.RecordAdditionalInfo(kSuggestMetadataKey, metadata);
       }
     }
+    // Copy over answer data from lower-ranking item, if necessary.
+    // This depends on the lower-ranking item always being added last - see
+    // use of push_back above.
+    AutocompleteMatch& more_relevant_match = i.first->second;
+    const AutocompleteMatch& less_relevant_match =
+        more_relevant_match.duplicate_matches.back();
+    if (!less_relevant_match.answer_type.empty() &&
+        more_relevant_match.answer_type.empty()) {
+      more_relevant_match.answer_type = less_relevant_match.answer_type;
+      more_relevant_match.answer_contents = less_relevant_match.answer_contents;
+    }
   }
 }