Replacing base::DIR_TEMP with ScopedTempDir when appropriate.

app/sql/transaction_unittest.cc

-// Copyright (c) 2009 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 "app/sql/connection.h"
 #include "app/sql/statement.h"
 #include "app/sql/transaction.h"
-#include "base/file_path.h"
 #include "base/file_util.h"
-#include "base/path_service.h"
+#include "base/memory/scoped_temp_dir.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/sqlite/sqlite3.h"
 
 class SQLTransactionTest : public testing::Test {
  public:
   SQLTransactionTest() {}
 
   void SetUp() {
-    ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &path_));
-    path_ = path_.AppendASCII("SQLStatementTest.db");
-    file_util::Delete(path_, false);
-    ASSERT_TRUE(db_.Open(path_));
+    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
+    ASSERT_TRUE(db_.Open(
+        temp_dir_.path().AppendASCII("SQLTransactionTest.db")));
 
     ASSERT_TRUE(db().Execute("CREATE TABLE foo (a, b)"));
   }
 
   void TearDown() {
     db_.Close();
 
     // If this fails something is going on with cleanup and later tests may

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

Can be removed.

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

Done.

     // fail, so we want to identify problems right away.
-    ASSERT_TRUE(file_util::Delete(path_, false));
+    ASSERT_TRUE(file_util::Delete(
+        temp_dir_.path().AppendASCII("SQLTransactionTest.db"), false));
   }
 
   sql::Connection& db() { return db_; }
 
   // Returns the number of rows in table "foo".
   int CountFoo() {
     sql::Statement count(db().GetUniqueStatement("SELECT count(*) FROM foo"));
     count.Step();
     return count.ColumnInt(0);
   }
 
  private:
-  FilePath path_;
+  ScopedTempDir temp_dir_;
   sql::Connection db_;
 };
 
 TEST_F(SQLTransactionTest, Commit) {
   {
     sql::Transaction t(&db());
     EXPECT_FALSE(t.is_open());
     EXPECT_TRUE(t.Begin());
     EXPECT_TRUE(t.is_open());
 
@@ skipping 74 matching lines @@
     EXPECT_EQ(1, db().transaction_nesting());
     {
       sql::Transaction inner3(&db());
       EXPECT_FALSE(inner3.Begin());
       EXPECT_EQ(1, db().transaction_nesting());
     }
   }
   EXPECT_EQ(0, db().transaction_nesting());
   EXPECT_EQ(0, CountFoo());
 }