Fix two tests that leak temporary files.

BUG=none
TEST=Run ExtensionsServiceTest and SessionBackendTest, make sure they don't leave extra temp files behind.
Review URL: http://codereview.chromium.org/180068

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25149 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 12 deletions

diff --git a/chrome/browser/sessions/session_backend_unittest.cc b/chrome/browser/sessions/session_backend_unittest.cc
index 3dc15ce..e68648d 100644
--- a/chrome/browser/sessions/session_backend_unittest.cc
+++ b/chrome/browser/sessions/session_backend_unittest.cc
@@ -2,12 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/scoped_temp_dir.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
-#include "base/path_service.h"
-#include "base/time.h"
 #include "chrome/browser/sessions/session_backend.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -35,16 +33,9 @@ SessionCommand* CreateCommandFromData(const TestData& data) {
 class SessionBackendTest : public testing::Test {
  protected:
   virtual void SetUp() {
-    std::string b = Int64ToString(base::Time::Now().ToInternalValue());
-
-    PathService::Get(base::DIR_TEMP, &path_);
-    path_ = path_.Append(FILE_PATH_LITERAL("SessionTestDirs"));
+    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
+    path_ = temp_dir_.path().Append(FILE_PATH_LITERAL("SessionTestDirs"));
     file_util::CreateDirectory(path_);
-    path_ = path_.AppendASCII(b);
-  }
-
-  virtual void TearDown() {
-    file_util::Delete(path_, true);
   }
 
   void AssertCommandEqualsData(const TestData& data, SessionCommand* command) {
@@ -56,6 +47,7 @@ class SessionBackendTest : public testing::Test {
 
   // Path used in testing.
   FilePath path_;
+  ScopedTempDir temp_dir_;
 };
 
 TEST_F(SessionBackendTest, SimpleReadWrite) {