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