Componentize ScoredHistoryMatch

chrome/browser/history/in_memory_url_index.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_IN_MEMORY_URL_INDEX_H_
 #define CHROME_BROWSER_HISTORY_IN_MEMORY_URL_INDEX_H_
 
 #include <functional>
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "base/task/cancelable_task_tracker.h"
-#include "chrome/browser/history/scored_history_match.h"
 #include "components/history/core/browser/history_db_task.h"
 #include "components/history/core/browser/history_service_observer.h"
 #include "components/history/core/browser/history_types.h"
+#include "components/history/core/browser/scored_history_match.h"
 #include "sql/connection.h"
 
 class HistoryService;
 class HistoryQuickProviderTest;
 
 namespace base {
 class Time;
 }
 
 namespace in_memory_url_index {
 class InMemoryURLIndexCacheItem;
 }
 
 namespace history {
 
 namespace imui = in_memory_url_index;
 
-class HistoryClient;
 class HistoryDatabase;
+class ScoredHistoryMatchClient;
 class URLIndexPrivateData;
 
 // The URL history source.
 // Holds portions of the URL database in memory in an indexed form.  Used to
 // quickly look up matching URLs for a given query string.  Used by
 // the HistoryURLProvider for inline autocomplete and to provide URL
 // matches to the omnibox.
 //
 // Note about multi-byte codepoints and the data structures in the
 // InMemoryURLIndex class: One will quickly notice that no effort is made to
@@ skipping 36 matching lines @@
   };
 
   // |history_service| which may be null during unit testing is used to register
   // |as an HistoryServiceObserver. |history_dir| is a path to the directory
   // containing the history database within the profile wherein the cache and
   // transaction journals will be stored. |languages| gives a list of language
   // encodings by which URLs and omnibox searches are broken down into words and
   // characters.
   InMemoryURLIndex(HistoryService* history_service,
                    const base::FilePath& history_dir,
-                   const std::string& languages,
-                   HistoryClient* client);
+                   const std::string& languages);
   ~InMemoryURLIndex() override;
 
   // Opens and prepares the index of historical URL visits. If the index private
   // data cannot be restored from its cache file then it is rebuilt from the
   // history database.
   void Init();
 
   // Signals that any outstanding initialization should be canceled and
   // flushes the cache to disk.
   void ShutDown();
 
   // Scans the history index and returns a vector with all scored, matching
   // history items. This entry point simply forwards the call on to the
   // URLIndexPrivateData class. For a complete description of this function
   // refer to that class.  If |cursor_position| is base::string16::npos, the
   // function doesn't do anything special with the cursor; this is equivalent
   // to the cursor being at the end.  In total, |max_matches| of items will be
   // returned in the |ScoredHistoryMatches| vector.
-  ScoredHistoryMatches HistoryItemsForTerms(const base::string16& term_string,
-                                            size_t cursor_position,
-                                            size_t max_matches);
+  ScoredHistoryMatches HistoryItemsForTerms(
+      const base::string16& term_string,
+      size_t cursor_position,
+      size_t max_matches,
+      const ScoredHistoryMatchClient* scored_history_match_client);
 
   // Deletes the index entry, if any, for the given |url|.
   void DeleteURL(const GURL& url);
 
   // Sets the optional observers for completion of restoral and saving of the
   // index's private data.
   void set_restore_cache_observer(
       RestoreCacheObserver* restore_cache_observer) {
     restore_cache_observer_ = restore_cache_observer;
   }
@@ skipping 121 matching lines @@
   base::CancelableTaskTracker* private_data_tracker() {
     return &private_data_tracker_;
   }
 
   // Returns the set of whitelisted schemes. For unit testing only.
   const std::set<std::string>& scheme_whitelist() { return scheme_whitelist_; }
 
   // The HistoryService; may be null when testing.
   HistoryService* history_service_;
 
-  // The HistoryClient; may be null when testing.
-  HistoryClient* history_client_;
-
   // Directory where cache file resides. This is, except when unit testing,
   // the same directory in which the history database is found. It should never
   // be empty.
   base::FilePath history_dir_;
 
   // Languages used during the word-breaking process during indexing.
   std::string languages_;
 
   // Only URLs with a whitelisted scheme are indexed.
   std::set<std::string> scheme_whitelist_;
@@ skipping 19 matching lines @@
   // temporary safety check to insure that the cache is saved before the
   // index has been destructed.
   bool needs_to_be_cached_;
 
   DISALLOW_COPY_AND_ASSIGN(InMemoryURLIndex);
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_IN_MEMORY_URL_INDEX_H_