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 c10f4f3b70d881f3c5dc81cd1d5b95c685ca436b..401e56a26774da068ce3cb96c1977333fc56b4da 100644
--- a/chrome/browser/history/scored_history_match.h
+++ b/chrome/browser/history/scored_history_match.h
@@ -98,6 +98,11 @@ 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);

[Peter Kasting, 2012/12/01 02:45:30]

Nit: One arg per line (local code style)

[Mark P, 2012/12/01 22:27:06]

Done.

+
   // Sets use_new_scoring based on command line flags and/or
   // field trial state.
   static void InitializeNewScoringField();