Replacing base::DIR_TEMP with ScopedTempDir when appropriate.

chrome/common/extensions/extension_unpacker_unittest.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/values.h"
+#include "base/memory/scoped_temp_dir.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_unpacker.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace errors = extension_manifest_errors;
 namespace keys = extension_manifest_keys;
 
 class ExtensionUnpackerTest : public testing::Test {
 public:
   void SetupUnpacker(const std::string& crx_name) {
     FilePath original_path;
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &original_path));
     original_path = original_path.AppendASCII("extensions")
         .AppendASCII("unpacker")
         .AppendASCII(crx_name);
     ASSERT_TRUE(file_util::PathExists(original_path)) << original_path.value();
 
     // Try bots won't let us write into DIR_TEST_DATA, so we have to create
     // a temp folder to play in.
-    ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &install_dir_));
-    install_dir_ = install_dir_.AppendASCII("extension_unpacker_test");
-    file_util::Delete(install_dir_, true);
-    file_util::CreateDirectory(install_dir_);
+    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
-    FilePath crx_path = install_dir_.AppendASCII(crx_name);
+    FilePath crx_path = temp_dir_.path().AppendASCII(crx_name);
     ASSERT_TRUE(file_util::CopyFile(original_path, crx_path)) <<
         "Original path " << original_path.value() <<
         ", Crx path " << crx_path.value();
 
     unpacker_.reset(new ExtensionUnpacker(crx_path));
   }
 
   virtual void TearDown() {

[Paweł Hajdan Jr., 2011/04/08 15:58:17]

An empty TearDown can be removed.

[Mike West, 2011/04/11 14:47:04]

Done.

-    ASSERT_TRUE(file_util::Delete(install_dir_, true)) <<
-        install_dir_.value();
   }
 
  protected:
-  FilePath install_dir_;
+  ScopedTempDir temp_dir_;
   scoped_ptr<ExtensionUnpacker> unpacker_;
 };
 
 TEST_F(ExtensionUnpackerTest, EmptyDefaultLocale) {
   SetupUnpacker("empty_default_locale.crx");
   EXPECT_FALSE(unpacker_->Run());
   EXPECT_EQ(errors::kInvalidDefaultLocale, unpacker_->error_message());
 }
 
 TEST_F(ExtensionUnpackerTest, HasDefaultLocaleMissingLocalesFolder) {
@@ skipping 49 matching lines @@
   EXPECT_TRUE(unpacker_->error_message().empty());
   ASSERT_EQ(2U, unpacker_->parsed_catalogs()->size());
 }
 
 TEST_F(ExtensionUnpackerTest, NoL10n) {
   SetupUnpacker("no_l10n.crx");
   EXPECT_TRUE(unpacker_->Run());
   EXPECT_TRUE(unpacker_->error_message().empty());
   EXPECT_EQ(0U, unpacker_->parsed_catalogs()->size());
 }