Componentize ScoredHistoryMatch

chrome/browser/autocomplete/history_quick_provider.h

Index: chrome/browser/autocomplete/history_quick_provider.h
diff --git a/chrome/browser/autocomplete/history_quick_provider.h b/chrome/browser/autocomplete/history_quick_provider.h
index 9a8df833e83678028ca208e517fa3f81def41c7f..e50a109818f8f31f4c9c52aac4e0fb2d5e19884d 100644
--- a/chrome/browser/autocomplete/history_quick_provider.h
+++ b/chrome/browser/autocomplete/history_quick_provider.h
@@ -19,6 +19,7 @@ class Profile;
 
 namespace history {
 class ScoredHistoryMatch;
+class ScoredHistoryMatchClient;
 }  // namespace history
 
 // This class is an autocomplete provider (a pseudo-internal component of
@@ -66,9 +67,15 @@ class HistoryQuickProvider : public HistoryProvider {
     index_for_testing_.reset(index);
   }
 
+  // Returns the ScoredHistoryMatchClient, lazily constructing it if necessary.
+  const history::ScoredHistoryMatchClient* GetScoredHistoryMatchClient();
+
   AutocompleteInput autocomplete_input_;
   std::string languages_;
 
+  // Used for computing ScoredHistoryMatches.
+  scoped_ptr<history::ScoredHistoryMatchClient> scored_history_match_client_;
+
   // Only used for testing.
   scoped_ptr<history::InMemoryURLIndex> index_for_testing_;