Replacing base::DIR_TEMP with ScopedTempDir when appropriate.

chrome/browser/importer/firefox_profile_lock_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/path_service.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
+#include "base/memory/scoped_temp_dir.h"
 #include "build/build_config.h"
 #include "chrome/browser/importer/firefox_profile_lock.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/file_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class FirefoxProfileLockTest : public testing::Test {
  public:

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

nit: Can this "public:" bit be removed?

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

Done.

  protected:
   virtual void SetUp() {
-    ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &test_path_));
-    FilePath::StringType dir_name = FILE_PATH_LITERAL("FirefoxProfileLockTest");
-    dir_name.append(StringPrintf(
-        FILE_PATH_LITERAL("-%d"), base::GetCurrentProcId()));
-    test_path_ = test_path_.Append(dir_name);
-    file_util::Delete(test_path_, true);
-    file_util::CreateDirectory(test_path_);
+    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
   }
 
   virtual void TearDown() {

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

An empty TearDown can just be removed.

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

Done.

-    ASSERT_TRUE(file_util::Delete(test_path_, true));
-    ASSERT_FALSE(file_util::PathExists(test_path_));
   }
 
-  FilePath test_path_;
+  ScopedTempDir temp_dir_;
 };
 
 TEST_F(FirefoxProfileLockTest, LockTest) {
-  FirefoxProfileLock lock1(test_path_);
+  FirefoxProfileLock lock1(temp_dir_.path());
   ASSERT_TRUE(lock1.HasAcquired());
   lock1.Unlock();
   ASSERT_FALSE(lock1.HasAcquired());
   lock1.Lock();
   ASSERT_TRUE(lock1.HasAcquired());
 }
 
 // Tests basic functionality and verifies that the lock file is deleted after
 // use.
 TEST_F(FirefoxProfileLockTest, ProfileLock) {
@@ skipping 76 matching lines @@
 
   lock1->Unlock();
   EXPECT_FALSE(lock1->HasAcquired());
 
   lock2->Lock();
   EXPECT_TRUE(lock2->HasAcquired());
   lock2->Unlock();
   EXPECT_FALSE(lock2->HasAcquired());
 }
 #endif