diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-03 01:14:21 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-03 01:14:21 +0000 |
| commit | aca3e9b6ab27f5606b8b4ad6fcc27f0f0bc91f6e (patch) | |
| tree | bcdde90d9ac1f890d2bbd5bfbc3e5c51cdf5e262 | |
| parent | 18fa811d4bc5722293a7e53926ca4ee302253dd9 (diff) | |
| download | chromium_src-aca3e9b6ab27f5606b8b4ad6fcc27f0f0bc91f6e.zip chromium_src-aca3e9b6ab27f5606b8b4ad6fcc27f0f0bc91f6e.tar.gz chromium_src-aca3e9b6ab27f5606b8b4ad6fcc27f0f0bc91f6e.tar.bz2 | |
Use more ScopedTempDirs.
BUG=none
TEST=ExtensionsServiceTest shouldn't leak temp files.
Review URL: http://codereview.chromium.org/342085
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30781 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/extensions_service_unittest.cc | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/chrome/browser/extensions/extensions_service_unittest.cc b/chrome/browser/extensions/extensions_service_unittest.cc index 3ca4b95..aa38fe6 100644 --- a/chrome/browser/extensions/extensions_service_unittest.cc +++ b/chrome/browser/extensions/extensions_service_unittest.cc @@ -10,6 +10,7 @@ #include "base/json/json_reader.h" #include "base/message_loop.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "chrome/browser/extensions/extension_creator.h" #include "chrome/browser/extensions/extensions_service.h" @@ -744,9 +745,10 @@ TEST_F(ExtensionsServiceTest, PackExtension) { .AppendASCII("behllobkkfkfnphdnhnkndlbkcpglgmj") .AppendASCII("1.0.0.0"); - FilePath output_directory; - file_util::CreateNewTempDirectory(FILE_PATH_LITERAL("chrome_"), - &output_directory); + ScopedTempDir temp_dir; + ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); + FilePath output_directory = temp_dir.path(); + FilePath crx_path(output_directory.AppendASCII("ex1.crx")); FilePath privkey_path(output_directory.AppendASCII("privkey.pem")); @@ -756,9 +758,6 @@ TEST_F(ExtensionsServiceTest, PackExtension) { ASSERT_TRUE(file_util::PathExists(privkey_path)); InstallExtension(crx_path, true); - - file_util::Delete(crx_path, false); - file_util::Delete(privkey_path, false); } // Test Packaging and installing an extension using an openssl generated key. @@ -781,9 +780,10 @@ TEST_F(ExtensionsServiceTest, PackExtensionOpenSSLKey) { "openssl_privkey_asn1.pem")); ASSERT_TRUE(file_util::PathExists(privkey_path)); - FilePath output_directory; - file_util::CreateNewTempDirectory(FILE_PATH_LITERAL("chrome_"), - &output_directory); + ScopedTempDir temp_dir; + ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); + FilePath output_directory = temp_dir.path(); + FilePath crx_path(output_directory.AppendASCII("ex1.crx")); scoped_ptr<ExtensionCreator> creator(new ExtensionCreator()); @@ -791,8 +791,6 @@ TEST_F(ExtensionsServiceTest, PackExtensionOpenSSLKey) { FilePath())); InstallExtension(crx_path, true); - - file_util::Delete(crx_path, false); } TEST_F(ExtensionsServiceTest, InstallTheme) { |