Remove obsolete code

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 7f49296f44b09f6d60f80d22b7e869255934cb0e..3c2a90fe73855fe22e192c9b6573a493bbd2f634 100644
--- a/chrome/test/base/testing_profile.cc
+++ b/chrome/test/base/testing_profile.cc
@@ -569,21 +569,15 @@ bool TestingProfile::CreateHistoryService(bool delete_file, bool no_db) {
           this, BuildHistoryService));
   if (!history_service->Init(
           no_db, history::HistoryDatabaseParamsForPath(this->GetPath()))) {
-    HistoryServiceFactory::GetInstance()->SetTestingFactoryAndUse(this, NULL);
+    HistoryServiceFactory::GetInstance()->SetTestingFactory(this, nullptr);
+    return false;
   }
   // Disable WebHistoryService by default, since it makes network requests.
-  WebHistoryServiceFactory::GetInstance()->SetTestingFactory(this, NULL);
+  WebHistoryServiceFactory::GetInstance()->SetTestingFactory(this, nullptr);
   return true;
 }
 
 void TestingProfile::DestroyHistoryService() {
-  // TODO(sdefresne): remove this once ChromeHistoryClient is no longer an
-  // HistoryServiceObserver, http://crbug.com/373326
-  ChromeHistoryClient* history_client =
-      ChromeHistoryClientFactory::GetForProfileWithoutCreating(this);
-  if (history_client)
-    history_client->Shutdown();
-
   HistoryService* history_service =
       HistoryServiceFactory::GetForProfileWithoutCreating(this);
   if (!history_service)