Replacing base::DIR_TEMP with ScopedTempDir when appropriate.

chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc

 // 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/memory/ref_counted.h"
 #include "base/memory/scoped_temp_dir.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
+#include "base/memory/scoped_temp_dir.h"
 #include "chrome/browser/extensions/sandboxed_extension_unpacker.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_unpacker.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace errors = extension_manifest_errors;
@@ skipping 27 matching lines @@
 
   void DelegateToFake() {
     ON_CALL(*this, OnUnpackSuccess(_, _, _))
         .WillByDefault(Invoke(::OnUnpackSuccess));
   }
 };
 
 class SandboxedExtensionUnpackerTest : public testing::Test {
  public:
   virtual void SetUp() {
+    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     file_thread_.reset(new BrowserThread(BrowserThread::FILE, &loop_));
     // It will delete itself.
     client_ = new MockSandboxedExtensionUnpackerClient;
     client_->DelegateToFake();
   }
 
   virtual void TearDown() {
     // Need to destruct SandboxedExtensionUnpacker before the message loop since
     // it posts a task to it.
     sandboxed_unpacker_ = NULL;
     loop_.RunAllPending();
-    // Clean up finally.
-    ASSERT_TRUE(file_util::Delete(install_dir_, true)) <<
-        install_dir_.value();
   }
 
   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("sandboxed_extension_unpacker_test");
-    file_util::Delete(install_dir_, true);
-    file_util::CreateDirectory(install_dir_);
-
-    FilePath crx_path = install_dir_.AppendASCII(crx_name);
+    // write the CRX to the temp directory, and create a subdirectory into

[Paweł Hajdan Jr., 2011/04/11 18:16:53]

nit: "create write" (see the previous line). Please make sure to make the entire
sentence correct.

[Mike West, 2011/04/12 07:04:04]

Good eye.  Thanks!

+    // which to unpack.
+    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));
 
     // Build a temp area where the extension will be unpacked.
-    ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &temp_dir_));
-    temp_dir_ = temp_dir_.AppendASCII("sandboxed_extension_unpacker_test_Temp");
-    ASSERT_TRUE(file_util::CreateDirectory(temp_dir_));
+    temp_path_ =
+        temp_dir_.path().AppendASCII("sandboxed_extension_unpacker_test_Temp");
+    ASSERT_TRUE(file_util::CreateDirectory(temp_path_));
 
     sandboxed_unpacker_ =
         new SandboxedExtensionUnpacker(crx_path, NULL, client_);
 
     // Hack since SandboxedExtensionUnpacker gets its background thread id from
     // the Start call, but we don't call it here.
     sandboxed_unpacker_->thread_identifier_ = BrowserThread::FILE;
     EXPECT_TRUE(PrepareUnpackerEnv());
   }
 
   bool PrepareUnpackerEnv() {
     sandboxed_unpacker_->extension_root_ =
-      install_dir_.AppendASCII(extension_filenames::kTempExtensionName);
+      temp_dir_.path().AppendASCII(extension_filenames::kTempExtensionName);
 
-    if (!sandboxed_unpacker_->temp_dir_.Set(install_dir_))
+    if (!sandboxed_unpacker_->temp_dir_.Set(temp_dir_.path()))
       return false;
     sandboxed_unpacker_->public_key_ =
       "ocnapchkplbmjmpfehjocmjnipfmogkh";
     return true;
   }
 
   void OnUnpackSucceeded() {
     sandboxed_unpacker_->OnUnpackExtensionSucceeded(
         *unpacker_->parsed_manifest());
   }
 
   FilePath GetInstallPath() {
-    return install_dir_.AppendASCII(extension_filenames::kTempExtensionName);
+    return temp_dir_.path().AppendASCII(
+        extension_filenames::kTempExtensionName);
   }
 
   bool TempFilesRemoved() {
     // Check that temporary files were cleaned up.
     file_util::FileEnumerator::FILE_TYPE files_and_dirs =
       static_cast<file_util::FileEnumerator::FILE_TYPE>(
         file_util::FileEnumerator::DIRECTORIES |
         file_util::FileEnumerator::FILES);
 
     file_util::FileEnumerator temp_iterator(
-      temp_dir_,
+      temp_path_,
       true,  // recursive
       files_and_dirs
     );
     int items_not_removed = 0;
     FilePath item_in_temp;
     item_in_temp = temp_iterator.Next();
     while (!item_in_temp.value().empty()) {
       items_not_removed++;
       EXPECT_STREQ(FILE_PATH_LITERAL(""), item_in_temp.value().c_str())
         << "File was not removed on success.";
       item_in_temp = temp_iterator.Next();
     }
     return (items_not_removed == 0);
   }
 
  protected:
-  FilePath install_dir_;
-  FilePath temp_dir_;
+  ScopedTempDir temp_dir_;
+  FilePath temp_path_;
   MockSandboxedExtensionUnpackerClient* client_;
   scoped_ptr<ExtensionUnpacker> unpacker_;
   scoped_refptr<SandboxedExtensionUnpacker> sandboxed_unpacker_;
   MessageLoop loop_;
   scoped_ptr<BrowserThread> file_thread_;
 };
 
 TEST_F(SandboxedExtensionUnpackerTest, NoCatalogsSuccess) {
   EXPECT_CALL(*client_, OnUnpackSuccess(_, _, _));
   EXPECT_CALL(*client_, OnUnpackFailure(_)).Times(0);
@@ skipping 41 matching lines @@
   OnUnpackSucceeded();
 
   // Check that there is newer _locales/en_US/messages.json file.
   base::PlatformFileInfo new_info;
   EXPECT_TRUE(file_util::GetFileInfo(messages_file, &new_info));
 
   EXPECT_TRUE(new_info.last_modified > old_info.last_modified);
 
   ASSERT_TRUE(TempFilesRemoved());
 }