Code clean up for ScoredHistoryMatch

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 12 matching lines @@
 
 // An HistoryMatch that has a score as well as metrics defining where in the
 // history item's URL and/or page title matches have occurred.
 class ScoredHistoryMatch : public history::HistoryMatch {
  public:
   // The maximum number of recent visits to examine in GetFrecency().
   // Public so url_index_private_data.cc knows how many visits it is
   // expected to deliver (at minimum) to this class.
   static const size_t kMaxVisitsToScore;
 
+  //These values are duplicated from the HistoryURLProvider

[sdefresne, 2014/05/22 12:39:23]

Those constants are only used on scored_history_match.cc so there is no need to
make them public. Instead, put them in an anonymous namespace in
scored_history_match.cc.

+  static const int kScoreForBestInlineableResult;
+  static const int kScoreForUnvisitedIntranetResult;
+  static const int kScoreForWhatYouTypedResult;
+  static const int kBaseScoreForNonInlineableResult;
+
   ScoredHistoryMatch();  // Required by STL.
 
   // Creates a new match with a raw score calculated for the history item
   // given in |row| with recent visits as indicated in |visits|.  First
   // determines if the row qualifies by seeing if all of the terms in
   // |terms_vector| occur in |row|.  If so, calculates a raw score.  This raw
   // score is in part determined by whether the matches occur at word
   // boundaries, the locations of which are stored in |word_starts|.  For some
   // terms, it's appropriate to look for the word boundary within the term.
   // For instance, the term ".net" should look for a word boundary at the "n".
@@ skipping 157 matching lines @@
   // matches) because if a non-inlineable match comes first than all matches
   // will get demoted later in HistoryQuickProvider to non-inlineable scores.
   // Set to -1 to indicate no maximum score.
   static int max_assigned_score_for_non_inlineable_matches_;
 };
 typedef std::vector<ScoredHistoryMatch> ScoredHistoryMatches;
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_SCORED_HISTORY_MATCH_H_