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

Unified Diff: chrome/browser/extensions/extension_service_unittest.cc

Issue 18584011: Rename base::Delete to base::DeleteFile (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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: chrome/browser/extensions/extension_service_unittest.cc
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index 5121e67e748c576621606f233ef68647790538eb..8811e4881bd67555250671d99b7c7a74c26a7516 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -518,13 +518,13 @@ void ExtensionServiceTestBase::InitializeInstalledExtensionService(
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
base::FilePath path = temp_dir_.path();
path = path.Append(FILE_PATH_LITERAL("TestingExtensionsPath"));
- base::Delete(path, true);
+ base::DeleteFile(path, true);
file_util::CreateDirectory(path);
base::FilePath temp_prefs = path.Append(FILE_PATH_LITERAL("Preferences"));
base::CopyFile(prefs_file, temp_prefs);
extensions_install_dir_ = path.Append(FILE_PATH_LITERAL("Extensions"));
- base::Delete(extensions_install_dir_, true);
+ base::DeleteFile(extensions_install_dir_, true);
base::CopyDirectory(source_install_dir, extensions_install_dir_, true);
ExtensionServiceInitParams params;
@@ -554,12 +554,12 @@ void ExtensionServiceTestBase::InitializeExtensionServiceHelper(
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
base::FilePath path = temp_dir_.path();
path = path.Append(FILE_PATH_LITERAL("TestingExtensionsPath"));
- base::Delete(path, true);
+ base::DeleteFile(path, true);
file_util::CreateDirectory(path);
base::FilePath prefs_filename =
path.Append(FILE_PATH_LITERAL("TestPreferences"));
extensions_install_dir_ = path.Append(FILE_PATH_LITERAL("Extensions"));
- base::Delete(extensions_install_dir_, true);
+ base::DeleteFile(extensions_install_dir_, true);
file_util::CreateDirectory(extensions_install_dir_);
ExtensionServiceInitParams params;
@@ -678,7 +678,7 @@ class ExtensionServiceTest
ASSERT_TRUE(base::PathExists(pem_path));
}
- ASSERT_TRUE(base::Delete(crx_path, false));
+ ASSERT_TRUE(base::DeleteFile(crx_path, false));
scoped_ptr<ExtensionCreator> creator(new ExtensionCreator());
ASSERT_TRUE(creator->Run(dir_path,
@@ -2091,7 +2091,7 @@ TEST_F(ExtensionServiceTest, PackExtension) {
// Repeat the run with the pem file gone, and no special flags
// Should refuse to overwrite the existing crx.
- base::Delete(privkey_path, false);
+ base::DeleteFile(privkey_path, false);
ASSERT_FALSE(creator->Run(input_directory, crx_path, base::FilePath(),
privkey_path, ExtensionCreator::kNoRunFlags));
@@ -2228,7 +2228,7 @@ TEST_F(ExtensionServiceTest, PackExtensionContainingKeyFails) {
ASSERT_TRUE(base::PathExists(crx_path));
ASSERT_TRUE(base::PathExists(privkey_path));
- base::Delete(crx_path, false);
+ base::DeleteFile(crx_path, false);
// Move the pem file into the extension.
base::Move(privkey_path,
input_directory.AppendASCII("privkey.pem"));
@@ -2331,7 +2331,7 @@ TEST_F(ExtensionServiceTest, LoadLocalizedTheme) {
// directory, and we don't want to copy the whole extension for a unittest.
base::FilePath theme_file = extension_path.Append(chrome::kThemePackFilename);
ASSERT_TRUE(base::PathExists(theme_file));
- ASSERT_TRUE(base::Delete(theme_file, false)); // Not recursive.
+ ASSERT_TRUE(base::DeleteFile(theme_file, false)); // Not recursive.
}
// Tests that we can change the ID of an unpacked extension by adding a key
« no previous file with comments | « chrome/browser/extensions/extension_creator.cc ('k') | chrome/browser/extensions/extension_startup_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698