Introduce HistoryClient interface

chrome/test/base/testing_profile.cc

Index: chrome/test/base/testing_profile.cc
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
index 4e394fc242c26e787c59b04de1df694cae081d28..8a19ae9c296d299e31b97c00bed99fc7b3ef4def 100644
--- a/chrome/test/base/testing_profile.cc
+++ b/chrome/test/base/testing_profile.cc
@@ -29,6 +29,7 @@
 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h"
 #include "chrome/browser/geolocation/chrome_geolocation_permission_context_factory.h"
 #include "chrome/browser/guest_view/guest_view_manager.h"
+#include "chrome/browser/history/chrome_history_client.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_db_task.h"
 #include "chrome/browser/history/history_service.h"
@@ -95,6 +96,7 @@
 using base::Time;
 using content::BrowserThread;
 using content::DownloadManagerDelegate;
+using history::ChromeHistoryClient;
 using testing::NiceMock;
 using testing::Return;
 
@@ -427,7 +429,7 @@ void TestingProfile::CreateFaviconService() {
 }
 
 static KeyedService* BuildHistoryService(content::BrowserContext* profile) {
-  return new HistoryService(static_cast<Profile*>(profile));
+  return new ChromeHistoryClient(static_cast<Profile*>(profile));
 }
 
 bool TestingProfile::CreateHistoryService(bool delete_file, bool no_db) {
@@ -439,9 +441,10 @@ bool TestingProfile::CreateHistoryService(bool delete_file, bool no_db) {
       return false;
   }
   // This will create and init the history service.
-  HistoryService* history_service = static_cast<HistoryService*>(
+  ChromeHistoryClient* history_client = static_cast<ChromeHistoryClient*>(
       HistoryServiceFactory::GetInstance()->SetTestingFactoryAndUse(
           this, BuildHistoryService));
+  HistoryService* history_service = history_client->history_service();
   if (!history_service->Init(this->GetPath(),
                              BookmarkModelFactory::GetForProfile(this),
                              no_db)) {