Index: chrome/test/base/testing_profile.cc |
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc |
index 3a3c0190f18ae2aa4d18b4479fd6bfd9ee8c3d57..7611a931c5fcf579b49d6c3b18cdfd324f742357 100644 |
--- a/chrome/test/base/testing_profile.cc |
+++ b/chrome/test/base/testing_profile.cc |
@@ -366,12 +366,13 @@ static BrowserContextKeyedService* BuildHistoryService( |
return new HistoryService(static_cast<Profile*>(profile)); |
} |
-void TestingProfile::CreateHistoryService(bool delete_file, bool no_db) { |
+bool TestingProfile::CreateHistoryService(bool delete_file, bool no_db) { |
DestroyHistoryService(); |
if (delete_file) { |
base::FilePath path = GetPath(); |
path = path.Append(chrome::kHistoryFilename); |
- base::DeleteFile(path, false); |
+ if (!base::DeleteFile(path, false) || base::PathExists(path)) |
+ return false; |
} |
// This will create and init the history service. |
HistoryService* history_service = static_cast<HistoryService*>( |
@@ -384,6 +385,7 @@ void TestingProfile::CreateHistoryService(bool delete_file, bool no_db) { |
} |
// Disable WebHistoryService by default, since it makes network requests. |
WebHistoryServiceFactory::GetInstance()->SetTestingFactory(this, NULL); |
+ return true; |
} |
void TestingProfile::DestroyHistoryService() { |