Omnibiox: Tweak HQP New Scoring and Re-Enable Field Trial

chrome/browser/history/scored_history_match.h

Index: chrome/browser/history/scored_history_match.h
diff --git a/chrome/browser/history/scored_history_match.h b/chrome/browser/history/scored_history_match.h
index 09c2135e756aeda2f76433612a32e33793ec542d..2a82d9996ca826c19142b9d774988910a79c57f2 100644
--- a/chrome/browser/history/scored_history_match.h
+++ b/chrome/browser/history/scored_history_match.h
@@ -114,6 +114,13 @@ struct ScoredHistoryMatch : public history::HistoryMatch {
   static float GetPopularityScore(int typed_count,
                                   int visit_count);
 
+  // Combines the three component scores into a final score that's
+  // an appropriate value to use as a relevancy score.
+  static float GetFinalRelevancyScore(
+      float topicality_score,
+      float recency_score,
+      float popularity_score);
+
   // Sets use_new_scoring based on command line flags and/or
   // field trial state.
   static void InitializeNewScoringField();