Replacing base::DIR_TEMP with ScopedTempDir when appropriate.

app/sql/connection_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 "app/sql/connection.h"
 #include "app/sql/statement.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 SQLConnectionTest : public testing::Test {
  public:
   SQLConnectionTest() {}
 
   void SetUp() {
-    ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &path_));
-    path_ = path_.AppendASCII("SQLConnectionTest.db");
-    file_util::Delete(path_, false);
-    ASSERT_TRUE(db_.Open(path_));
+    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
+    ASSERT_TRUE(db_.Open(temp_dir_.path().AppendASCII("SQLConnectionTest.db")));
   }
 
   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]

This can also be removed now.

[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("SQLConnectionTest.db"), false));
   }
 
   sql::Connection& db() { return db_; }
 
  private:
-  FilePath path_;
+  ScopedTempDir temp_dir_;
   sql::Connection db_;
 };
 
 TEST_F(SQLConnectionTest, Execute) {
   // Valid statement should return true.
   ASSERT_TRUE(db().Execute("CREATE TABLE foo (a, b)"));
   EXPECT_EQ(SQLITE_OK, db().GetErrorCode());
 
   // Invalid statement should fail.
   ASSERT_FALSE(db().Execute("CREATE TAB foo (a, b"));
@@ skipping 58 matching lines @@
   int64 row = db().GetLastInsertRowId();
   EXPECT_LT(0, row);
 
   // It should be the primary key of the row we just inserted.
   sql::Statement s(db().GetUniqueStatement("SELECT value FROM foo WHERE id=?"));
   s.BindInt64(0, row);
   ASSERT_TRUE(s.Step());
   EXPECT_EQ(12, s.ColumnInt(0));
 }