Cleanup ChromeHistoryClientFactory

chrome/browser/history/chrome_history_client_factory.h

Index: chrome/browser/history/chrome_history_client_factory.h
diff --git a/chrome/browser/history/chrome_history_client_factory.h b/chrome/browser/history/chrome_history_client_factory.h
index 9b8a32f9863c9fc34f7aae063259aaa31c9b38c6..4b8741b00c5405bf6f1dc56b2b54eceb5cfce8c9 100644
--- a/chrome/browser/history/chrome_history_client_factory.h
+++ b/chrome/browser/history/chrome_history_client_factory.h
@@ -10,20 +10,17 @@
 template <typename T>
 struct DefaultSingletonTraits;
 
-class ChromeHistoryClient;
 class Profile;
 
+namespace history {
+class HistoryClient;
+}
+
 // Singleton that owns all ChromeHistoryClients and associates them with
 // Profiles.
 class ChromeHistoryClientFactory : public BrowserContextKeyedServiceFactory {
  public:
-  static ChromeHistoryClient* GetForProfile(Profile* profile);
-
-  // TODO(sdefresne): remove this once ChromeHistoryClient is no longer an
-  // HistoryServiceObserver and can follow the regular shutdown even during
-  // tests.
-  static ChromeHistoryClient* GetForProfileWithoutCreating(Profile* profile);
-
+  static history::HistoryClient* GetForProfile(Profile* profile);
   static ChromeHistoryClientFactory* GetInstance();
 
  private: