Index: trunk/src/chrome/browser/history/top_sites_impl_unittest.cc |
=================================================================== |
--- trunk/src/chrome/browser/history/top_sites_impl_unittest.cc (revision 213150) |
+++ trunk/src/chrome/browser/history/top_sites_impl_unittest.cc (working copy) |
@@ -149,7 +149,7 @@ |
virtual void SetUp() { |
profile_.reset(new TestingProfile); |
if (CreateHistoryAndTopSites()) { |
- ASSERT_TRUE(profile_->CreateHistoryService(false, false)); |
+ profile_->CreateHistoryService(false, false); |
profile_->CreateTopSites(); |
profile_->BlockUntilTopSitesLoaded(); |
} |
@@ -360,7 +360,7 @@ |
data_path.AppendASCII("thumbnails.3.sql"), |
profile()->GetPath().Append(chrome::kThumbnailsFilename))); |
- ASSERT_TRUE(profile()->CreateHistoryService(false, false)); |
+ profile()->CreateHistoryService(false, false); |
profile()->CreateTopSites(); |
profile()->BlockUntilTopSitesLoaded(); |
} |
@@ -914,7 +914,7 @@ |
profile()->GetPath().Append(chrome::kThumbnailsFilename))); |
// Recreate top sites and make sure everything is still there. |
- ASSERT_TRUE(profile()->CreateHistoryService(false, false)); |
+ profile()->CreateHistoryService(false, false); |
RecreateTopSitesAndBlock(); |
ASSERT_NO_FATAL_FAILURE(MigrationAssertions()); |
@@ -1207,7 +1207,7 @@ |
EXPECT_FALSE(IsTopSitesLoaded()); |
// Load history, which should make TopSites finish loading too. |
- ASSERT_TRUE(profile()->CreateHistoryService(false, false)); |
+ profile()->CreateHistoryService(false, false); |
profile()->BlockUntilTopSitesLoaded(); |
EXPECT_TRUE(IsTopSitesLoaded()); |
} |
@@ -1227,7 +1227,7 @@ |
// Makes sure if history is unloaded after topsites is loaded we don't hit any |
// assertions. |
TEST_F(TopSitesUnloadTest, UnloadHistoryTest) { |
- ASSERT_TRUE(profile()->CreateHistoryService(false, false)); |
+ profile()->CreateHistoryService(false, false); |
profile()->CreateTopSites(); |
profile()->BlockUntilTopSitesLoaded(); |
HistoryServiceFactory::GetForProfile( |
@@ -1250,7 +1250,7 @@ |
profile()->GetPath().Append(chrome::kThumbnailsFilename))); |
// Create history and block until it's loaded. |
- ASSERT_TRUE(profile()->CreateHistoryService(false, false)); |
+ profile()->CreateHistoryService(false, false); |
profile()->BlockUntilHistoryProcessesPendingRequests(); |
// Create top sites and unload history. |