Componentize ScoredHistoryMatch

chrome/browser/history/url_index_private_data.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_URL_INDEX_PRIVATE_DATA_H_
 #define CHROME_BROWSER_HISTORY_URL_INDEX_PRIVATE_DATA_H_
 
 #include <set>
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/history/history_service.h"
-#include "chrome/browser/history/scored_history_match.h"
 #include "components/history/core/browser/in_memory_url_index_cache.pb.h"
 #include "components/history/core/browser/in_memory_url_index_types.h"
+#include "components/history/core/browser/scored_history_match.h"
 
 class HistoryQuickProviderTest;
 
 namespace in_memory_url_index {
 class InMemoryURLIndexCacheItem;
 }
 
 namespace history {
 
 namespace imui = in_memory_url_index;
 
-class HistoryClient;
 class HistoryDatabase;
 class InMemoryURLIndex;
 class RefCountedBool;
 
 // Current version of the cache file.
 static const int kCurrentCacheFileVersion = 5;
 
 // A structure private to InMemoryURLIndex describing its internal data and
 // providing for restoring, rebuilding and updating that internal data. As
 // this class is for exclusive use by the InMemoryURLIndex class there should
@@ skipping 15 matching lines @@
   // set). Once we have a set of candidates, they are filtered to ensure
   // that all |term_string| terms, as separated by whitespace and the
   // cursor (if set), occur within the candidate's URL or page title.
   // Scores are then calculated on no more than |kItemsToScoreLimit|
   // candidates, as the scoring of such a large number of candidates may
   // cause perceptible typing response delays in the omnibox. This is
   // likely to occur for short omnibox terms such as 'h' and 'w' which
   // will be found in nearly all history candidates. Results are sorted by
   // descending score. The full results set (i.e. beyond the
   // |kItemsToScoreLimit| limit) will be retained and used for subsequent calls
-  // to this function. |history_client| is used to boost a result's score if
-  // its URL is referenced by one or more of the user's bookmarks.  |languages|
-  // is used to help parse/format the URLs in the history index.  In total,
-  // |max_matches| of items will be returned in the |ScoredHistoryMatches|
-  // vector.
-  ScoredHistoryMatches HistoryItemsForTerms(base::string16 term_string,
-                                            size_t cursor_position,
-                                            size_t max_matches,
-                                            const std::string& languages,
-                                            HistoryClient* history_client);
+  // to this function. |languages| is used to help parse/format the URLs in the
+  // history index.  In total, |max_matches| of items will be returned in the
+  // |ScoredHistoryMatches| vector.
+  ScoredHistoryMatches HistoryItemsForTerms(
+      base::string16 term_string,
+      size_t cursor_position,
+      size_t max_matches,
+      const std::string& languages,
+      const ScoredHistoryMatch::Builder& builder);
 
   // Adds the history item in |row| to the index if it does not already already
   // exist and it meets the minimum 'quick' criteria. If the row already exists
   // in the index then the index will be updated if the row still meets the
   // criteria, otherwise the row will be removed from the index. Returns true
   // if the index was actually updated. |languages| gives a list of language
   // encodings by which the URLs and page titles are broken down into words and
   // characters. |scheme_whitelist| is used to filter non-qualifying schemes.
   // |history_service| is used to schedule an update to the recent visits
   // component of this URL's entry in the index.
@@ skipping 104 matching lines @@
     bool used_;  // True if this item has been used for the current term search.
   };
   typedef std::map<base::string16, SearchTermCacheItem> SearchTermCacheMap;
 
   // A helper class which performs the final filter on each candidate
   // history URL match, inserting accepted matches into |scored_matches_|.
   class AddHistoryMatch : public std::unary_function<HistoryID, void> {
    public:
     AddHistoryMatch(const URLIndexPrivateData& private_data,
                     const std::string& languages,
-                    HistoryClient* history_client,
                     const base::string16& lower_string,
                     const String16Vector& lower_terms,
-                    const base::Time now);
+                    const base::Time now,
+                    const ScoredHistoryMatch::Builder& builder);
     ~AddHistoryMatch();
 
     void operator()(const HistoryID history_id);
 
     ScoredHistoryMatches ScoredMatches() const { return scored_matches_; }
 
    private:
     const URLIndexPrivateData& private_data_;
     const std::string& languages_;
-    HistoryClient* history_client_;
+    const ScoredHistoryMatch::Builder& builder_;
     ScoredHistoryMatches scored_matches_;
     const base::string16& lower_string_;
     const String16Vector& lower_terms_;
     WordStarts lower_terms_to_word_starts_offsets_;
     const base::Time now_;
   };
 
   // A helper predicate class used to filter excess history items when the
   // candidate results set is too large.
   class HistoryItemFactorGreater
@@ skipping 164 matching lines @@
   // Used for unit testing only. Records the number of candidate history items
   // at three stages in the index searching process.
   size_t pre_filter_item_count_;    // After word index is queried.
   size_t post_filter_item_count_;   // After trimming large result set.
   size_t post_scoring_item_count_;  // After performing final filter/scoring.
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_URL_INDEX_PRIVATE_DATA_H_