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

chrome/browser/history/scored_history_match.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_HISTORY_SCORED_HISTORY_MATCH_H_
 #define CHROME_BROWSER_HISTORY_SCORED_HISTORY_MATCH_H_
 
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 96 matching lines @@
 
   // Pre-calculates days_ago_to_recency_numerator_, used in
   // GetRecencyScore().
   static void FillInDaysAgoToRecencyScoreArray();
 
   // Returns a popularity score based on |typed_count| and
   // |visit_count|.
   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();
 
   // Sets only_count_matches_at_word_boundaries based on the field trial state.
   static void InitializeOnlyCountMatchesAtWordBoundariesField();
 
   // Sets also_do_hup_like_scoring based on the field trial state.
   static void InitializeAlsoDoHUPLikeScoringField();
 
@@ skipping 44 matching lines @@
   // a score that's similar to the score HistoryURL provider would assign).
   // This variable is set in the constructor by examining the field trial
   // state.
   static bool also_do_hup_like_scoring;
 };
 typedef std::vector<ScoredHistoryMatch> ScoredHistoryMatches;
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_SCORED_HISTORY_MATCH_H_