Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Unified Diff: trunk/src/chrome/test/base/testing_profile.cc

Issue 19714004: Revert 213148 "Add asserts to TestingProfile::CreateHistoryServi..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/chrome/test/base/testing_profile.h ('k') | trunk/src/chrome/test/perf/generate_profile.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/test/base/testing_profile.cc
===================================================================
--- trunk/src/chrome/test/base/testing_profile.cc (revision 213150)
+++ trunk/src/chrome/test/base/testing_profile.cc (working copy)
@@ -351,13 +351,12 @@
return new HistoryService(static_cast<Profile*>(profile));
}
-bool TestingProfile::CreateHistoryService(bool delete_file, bool no_db) {
+void TestingProfile::CreateHistoryService(bool delete_file, bool no_db) {
DestroyHistoryService();
if (delete_file) {
base::FilePath path = GetPath();
path = path.Append(chrome::kHistoryFilename);
- if (!base::DeleteFile(path, false) || base::PathExists(path))
- return false;
+ base::DeleteFile(path, false);
}
// This will create and init the history service.
HistoryService* history_service = static_cast<HistoryService*>(
@@ -370,7 +369,6 @@
}
// Disable WebHistoryService by default, since it makes network requests.
WebHistoryServiceFactory::GetInstance()->SetTestingFactory(this, NULL);
- return true;
}
void TestingProfile::DestroyHistoryService() {
« no previous file with comments | « trunk/src/chrome/test/base/testing_profile.h ('k') | trunk/src/chrome/test/perf/generate_profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698