Revert 213148 "Add asserts to TestingProfile::CreateHistoryServi..."

trunk/src/chrome/browser/history/top_sites_likely_impl_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/format_macros.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 131 matching lines @@
 class TopSitesLikelyImplTest : public HistoryUnitTestBase {
  public:
   TopSitesLikelyImplTest()
       : ui_thread_(BrowserThread::UI, &message_loop_),
         db_thread_(BrowserThread::DB, &message_loop_) {
   }
 
   virtual void SetUp() {
     profile_.reset(new TestingProfile);
     if (CreateHistoryAndTopSites()) {
-      ASSERT_TRUE(profile_->CreateHistoryService(false, false));
+      profile_->CreateHistoryService(false, false);
       profile_->CreateTopSites();
       profile_->BlockUntilTopSitesLoaded();
     }
   }
 
   virtual void TearDown() {
     profile_.reset();
   }
 
   // Returns true if history and top sites should be created in SetUp.
@@ skipping 191 matching lines @@
     data_path = data_path.AppendASCII("top_sites");
 
     // Set up history and thumbnails as they would be before migration.
     ASSERT_NO_FATAL_FAILURE(ExecuteSQLScript(
         data_path.AppendASCII("history.19.sql"),
         profile()->GetPath().Append(chrome::kHistoryFilename)));
     ASSERT_NO_FATAL_FAILURE(ExecuteSQLScript(
         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();
   }
 
   // Returns true if history and top sites should be created in SetUp.
   virtual bool CreateHistoryAndTopSites() OVERRIDE {
     return false;
   }
 
  protected:
@@ skipping 533 matching lines @@
 
   // We need to wait for top sites and history to finish processing requests.
   WaitForTopSites();
   WaitForHistory();
 
   // Make sure there is no longer a Thumbnails file on disk.
   ASSERT_FALSE(base::PathExists(
                    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());
 }
 
 // Verifies that callbacks are notified correctly if requested before top sites
 // has loaded.
 TEST_F(TopSitesLikelyImplTest, NotifyCallbacksWhenLoaded) {
   // Recreate top sites. It won't be loaded now.
   profile()->CreateTopSites();
@@ skipping 272 matching lines @@
   // before TopSites is considered loaded.
   sql::Connection::Delete(
       profile()->GetPath().Append(chrome::kTopSitesFilename));
 
   // Create TopSites, but not History.
   profile()->CreateTopSites();
   WaitForTopSites();
   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());
 }
 
 class TopSitesLikelyUnloadTest : public TopSitesLikelyImplTest {
  public:
   TopSitesLikelyUnloadTest() {}
 
   virtual bool CreateHistoryAndTopSites() OVERRIDE {
     return false;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TopSitesLikelyUnloadTest);
 };
 
 // Makes sure if history is unloaded after topsites is loaded we don't hit any
 // assertions.
 TEST_F(TopSitesLikelyUnloadTest, UnloadHistoryTest) {
-  ASSERT_TRUE(profile()->CreateHistoryService(false, false));
+  profile()->CreateHistoryService(false, false);
   profile()->CreateTopSites();
   profile()->BlockUntilTopSitesLoaded();
   HistoryServiceFactory::GetForProfile(
       profile(), Profile::EXPLICIT_ACCESS)->UnloadBackend();
   profile()->BlockUntilHistoryProcessesPendingRequests();
 }
 
 // Makes sure if history (with migration code) is unloaded after topsites is
 // loaded we don't hit any assertions.
 TEST_F(TopSitesLikelyUnloadTest, UnloadWithMigration) {
   // Set up history and thumbnails as they would be before migration.
   base::FilePath data_path;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
   data_path = data_path.AppendASCII("top_sites");
   ASSERT_NO_FATAL_FAILURE(ExecuteSQLScript(
       data_path.AppendASCII("history.19.sql"),
       profile()->GetPath().Append(chrome::kHistoryFilename)));
   ASSERT_NO_FATAL_FAILURE(ExecuteSQLScript(
       data_path.AppendASCII("thumbnails.3.sql"),
       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.
   content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_TOP_SITES_LOADED,
       content::Source<Profile>(profile()));
   profile()->CreateTopSites();
   HistoryServiceFactory::GetForProfile(
       profile(), Profile::EXPLICIT_ACCESS)->UnloadBackend();
   profile()->BlockUntilHistoryProcessesPendingRequests();
   observer.Wait();
 }
 
 }  // namespace history