Add asserts to TestingProfile::CreateHistoryService to ensure files are deleted

chrome/test/base/testing_profile.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 "chrome/test/base/testing_profile.h"
 
 #include "build/build_config.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 341 matching lines @@
 static BrowserContextKeyedService* BuildHistoryService(
     content::BrowserContext* profile) {
   return new HistoryService(static_cast<Profile*>(profile));
 }
 
 void TestingProfile::CreateHistoryService(bool delete_file, bool no_db) {
   DestroyHistoryService();
   if (delete_file) {
     base::FilePath path = GetPath();
     path = path.Append(chrome::kHistoryFilename);
-    base::DeleteFile(path, false);
+    ASSERT_TRUE(base::DeleteFile(path, false));

[sky, 2013/07/19 20:04:57]

In general you shouldn't use ASSERTS in tests. It makes the whole harness crash
and no further tests are run.

[rmcilroy, 2013/07/22 11:18:07]

Changed these to EXPECTS (I thought ASSERTS were allowed in setup-type code, but
am fine with these being EXPECTS in either case).

+    ASSERT_FALSE(base::PathExists(path));
   }
   // This will create and init the history service.
   HistoryService* history_service = static_cast<HistoryService*>(
       HistoryServiceFactory::GetInstance()->SetTestingFactoryAndUse(
           this, BuildHistoryService));
   if (!history_service->Init(this->GetPath(),
                              BookmarkModelFactory::GetForProfile(this),
                              no_db)) {
     HistoryServiceFactory::GetInstance()->SetTestingFactoryAndUse(this, NULL);
   }
@@ skipping 438 matching lines @@
 
 scoped_ptr<TestingProfile> TestingProfile::Builder::Build() {
   DCHECK(!build_called_);
   build_called_ = true;
   return scoped_ptr<TestingProfile>(new TestingProfile(
       path_,
       delegate_,
       extension_policy_,
       pref_service_.Pass()));
 }