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

Unified Diff: trunk/src/chrome/browser/autocomplete/history_url_provider_unittest.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
Index: trunk/src/chrome/browser/autocomplete/history_url_provider_unittest.cc
===================================================================
--- trunk/src/chrome/browser/autocomplete/history_url_provider_unittest.cc (revision 213150)
+++ trunk/src/chrome/browser/autocomplete/history_url_provider_unittest.cc (working copy)
@@ -152,12 +152,12 @@
// testing::Test
virtual void SetUp() {
- ASSERT_TRUE(SetUpImpl(false));
+ SetUpImpl(false);
}
virtual void TearDown();
// Does the real setup.
- bool SetUpImpl(bool no_db) WARN_UNUSED_RESULT;
+ void SetUpImpl(bool no_db);
// Fills test data into the history system.
void FillData();
@@ -195,7 +195,7 @@
class HistoryURLProviderTestNoDB : public HistoryURLProviderTest {
protected:
virtual void SetUp() {
- ASSERT_TRUE(SetUpImpl(true));
+ SetUpImpl(true);
}
};
@@ -204,10 +204,9 @@
base::MessageLoop::current()->Quit();
}
-bool HistoryURLProviderTest::SetUpImpl(bool no_db) {
+void HistoryURLProviderTest::SetUpImpl(bool no_db) {
profile_.reset(new TestingProfile());
- if (!(profile_->CreateHistoryService(true, no_db)))
- return false;
+ profile_->CreateHistoryService(true, no_db);
if (!no_db) {
profile_->BlockUntilHistoryProcessesPendingRequests();
profile_->BlockUntilHistoryIndexIsRefreshed();
@@ -220,7 +219,6 @@
TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse(
profile_.get(), &HistoryURLProviderTest::CreateTemplateURLService);
FillData();
- return true;
}
void HistoryURLProviderTest::TearDown() {

Powered by Google App Engine
This is Rietveld 408576698