Split HistoryClient in two objects

components/history/core/browser/history_backend.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 COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_BACKEND_H_
 #define COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_BACKEND_H_
 
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 24 matching lines @@
 struct ThumbnailScore;
 
 namespace base {
 class MessageLoop;
 class SingleThreadTaskRunner;
 }
 
 namespace history {
 class CommitLaterTask;
 struct DownloadRow;
+class HistoryBackendClient;
 class HistoryBackendDBBaseTest;
 class HistoryBackendObserver;
 class HistoryBackendTest;
-class HistoryClient;
 class HistoryDatabase;
 struct HistoryDatabaseParams;
 struct HistoryDetails;
 class HistoryDBTask;
 class InMemoryHistoryBackend;
 class TypedUrlSyncableService;
 class VisitFilter;
 class HistoryBackendHelper;
 
 // The maximum number of icons URLs per page which can be stored in the
@@ skipping 105 matching lines @@
   // be called on the history thread.
   //
   // |history_dir| is the directory where the history files will be placed.
   // See the definition of BroadcastNotificationsCallback above. This function
   // takes ownership of the callback pointer.
   //
   // |history_client| is used to determine bookmarked URLs when deleting and
   // may be null.
   //
   // This constructor is fast and does no I/O, so can be called at any time.
-  HistoryBackend(Delegate* delegate, HistoryClient* history_client,
+  HistoryBackend(Delegate* delegate,
+                 scoped_ptr<HistoryBackendClient> backend_client,
                  scoped_refptr<base::SequencedTaskRunner> task_runner);
 
   // Must be called after creation but before any objects are created. If this
   // fails, all other functions will fail as well. (Since this runs on another
   // thread, we don't bother returning failure.)
   //
   // |languages| gives a list of language encodings with which the history
   // URLs and omnibox searches are interpreted.
   // |force_fail| can be set during unittests to unconditionally fail to init.
   void Init(const std::string& languages,
@@ skipping 570 matching lines @@
   // Deletes all information in the history database, except for the supplied
   // set of URLs in the URL table (these should correspond to the bookmarked
   // URLs).
   //
   // The IDs of the URLs may change.
   bool ClearAllMainHistory(const URLRows& kept_urls);
 
   // Deletes the FTS index database files, which are no longer used.
   void DeleteFTSIndexDatabases();
 
-  // Returns the HistoryClient, blocking until the bookmarks are loaded. This
-  // may return null during testing.
-  HistoryClient* GetHistoryClient();
-
   // Data ----------------------------------------------------------------------
 
   // Delegate. See the class definition above for more information. This will
   // be null before Init is called and after Cleanup, but is guaranteed
   // non-null in between.
   scoped_ptr<Delegate> delegate_;
 
   // Directory where database files will be stored, empty until Init is called.
   base::FilePath history_dir_;
 
@@ skipping 37 matching lines @@
   VisitTracker tracker_;
 
   // A boolean variable to track whether we have already purged obsolete segment
   // data.
   bool segment_queried_;
 
   // List of QueuedHistoryDBTasks to run;
   std::list<QueuedHistoryDBTask*> queued_history_db_tasks_;
 
   // Used to determine if a URL is bookmarked; may be null.
-  //
-  // Use GetHistoryClient to access this, which makes sure the bookmarks are
-  // loaded before returning.
-  HistoryClient* history_client_;
+  scoped_ptr<HistoryBackendClient> backend_client_;
 
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
 
   // Used to allow embedder code to stash random data by key. Those object will
   // be deleted before closing the databases (hence the member variable instead
   // of inheritance from base::SupportsUserData).
   scoped_ptr<HistoryBackendHelper> supports_user_data_helper_;
 
   // Used to manage syncing of the typed urls datatype. This will be null before
   // Init is called.
   scoped_ptr<TypedUrlSyncableService> typed_url_syncable_service_;
 
   // Listens for the system being under memory pressure.
   scoped_ptr<base::MemoryPressureListener> memory_pressure_listener_;
 
   // List of observers
   base::ObserverList<HistoryBackendObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryBackend);
 };
 
 }  // namespace history
 
 #endif  // COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_BACKEND_H_