Introduce BookmarkClient interface to abstract embedder

chrome/browser/bookmarks/bookmark_index.h

 // Copyright (c) 2010 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_BOOKMARKS_BOOKMARK_INDEX_H_
 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_INDEX_H_
 
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/strings/string16.h"
 
+class BookmarkClient;
 class BookmarkNode;
 struct BookmarkTitleMatch;
 
-namespace content {
-class BrowserContext;
-}
-
-namespace history {
-class URLDatabase;
-}
-
 namespace query_parser {
 class QueryNode;
 class QueryParser;
 }
 
 // BookmarkIndex maintains an index of the titles of bookmarks for quick
 // look up. BookmarkIndex is owned and maintained by BookmarkModel, you
 // shouldn't need to interact directly with BookmarkIndex.
 //
 // BookmarkIndex maintains the index (index_) as a map of sets. The map (type
 // Index) maps from a lower case string to the set (type NodeSet) of
 // BookmarkNodes that contain that string in their title.
 class BookmarkIndex {
  public:
-  explicit BookmarkIndex(content::BrowserContext* browser_context);
+  explicit BookmarkIndex();
   ~BookmarkIndex();
 
   // Invoked when a bookmark has been added to the model.
   void Add(const BookmarkNode* node);
 
   // Invoked when a bookmark has been removed from the model.
   void Remove(const BookmarkNode* node);
 
   // Returns up to |max_count| of bookmarks containing the text |query|.
-  void GetBookmarksWithTitlesMatching(
-      const base::string16& query,
-      size_t max_count,
-      std::vector<BookmarkTitleMatch>* results);
+  void GetBookmarksWithTitlesMatching(BookmarkClient* client,
+                                      const base::string16& query,
+                                      size_t max_count,
+                                      std::vector<BookmarkTitleMatch>* results);
 
  private:
   typedef std::set<const BookmarkNode*> NodeSet;
   typedef std::map<base::string16, NodeSet> Index;
 
   struct Match;
   typedef std::vector<Match> Matches;
 
   // Pairs BookmarkNodes and the number of times the nodes' URLs were typed.
   // Used to sort Matches in decreasing order of typed count.
   typedef std::pair<const BookmarkNode*, int> NodeTypedCountPair;
   typedef std::vector<NodeTypedCountPair> NodeTypedCountPairs;
 
   // Extracts |matches.nodes| into NodeTypedCountPairs, sorts the pairs in
   // decreasing order of typed count, and then de-dupes the matches.
-  void SortMatches(const Matches& matches,
+  void SortMatches(BookmarkClient* client,
+                   const Matches& matches,
                    NodeTypedCountPairs* node_typed_counts) const;
 
-  // Extracts BookmarkNodes from |match| and retrieves typed counts for each
-  // node from the in-memory database. Inserts pairs containing the node and
-  // typed count into the vector |node_typed_counts|. |node_typed_counts| is
-  // sorted in decreasing order of typed count.
-  void ExtractBookmarkNodePairs(history::URLDatabase* url_db,
-                                const Match& match,
-                                NodeTypedCountPairs* node_typed_counts) const;
-
   // Sort function for NodeTypedCountPairs. We sort in decreasing order of typed
   // count so that the best matches will always be added to the results.
   static bool NodeTypedCountPairSortFunc(const NodeTypedCountPair& a,
                                          const NodeTypedCountPair& b) {
       return a.second > b.second;
   }
 
   // Add |node| to |results| if the node matches the query.
   void AddMatchToResults(
       const BookmarkNode* node,
@@ skipping 33 matching lines @@
   std::vector<base::string16> ExtractQueryWords(const base::string16& query);
 
   // Adds |node| to |index_|.
   void RegisterNode(const base::string16& term, const BookmarkNode* node);
 
   // Removes |node| from |index_|.
   void UnregisterNode(const base::string16& term, const BookmarkNode* node);
 
   Index index_;
 
-  content::BrowserContext* browser_context_;
-
   DISALLOW_COPY_AND_ASSIGN(BookmarkIndex);
 };
 
 #endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_INDEX_H_