Revert 152946 - Replace HistoryQuickProvider protobuf-based caching with an SQLite-based database.

chrome/test/base/testing_profile.h

Index: chrome/test/base/testing_profile.h
===================================================================
--- chrome/test/base/testing_profile.h	(revision 152962)
+++ chrome/test/base/testing_profile.h	(working copy)
@@ -37,8 +37,6 @@
 
 class CommandLine;
 class ExtensionSpecialStoragePolicy;
-class FaviconService;
-class HistoryService;
 class HostContentSettingsMap;
 class PrefService;
 class ProfileDependencyManager;
@@ -141,12 +139,6 @@
   // for testing error conditions.
   void CreateHistoryService(bool delete_file, bool no_db);
 
-  // Initializes the history service. If |no_db| is true, the history backend
-  // will fail to initialize its database; this is useful for testing error
-  // conditions. Returns true upon success.
-  virtual bool InitHistoryService(HistoryService* history_service,
-                                  bool no_db);
-
   // Shuts down and nulls out the reference to HistoryService.
   void DestroyHistoryService();
 
Property changes on: chrome/test/base/testing_profile.h
___________________________________________________________________
Deleted: svn:mergeinfo