Replacing base::DIR_TEMP with ScopedTempDir when appropriate.

app/sql/statement_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 <string>
 
 #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 StatementErrorHandler : public sql::ErrorDelegate {
  public:
   StatementErrorHandler() : error_(SQLITE_OK) {}
 
   virtual int OnError(int error, sql::Connection* connection,
                       sql::Statement* stmt) {
     error_ = error;
@@ skipping 14 matching lines @@
  private:
   int error_;
   std::string sql_text_;
 };
 
 class SQLStatementTest : public testing::Test {
  public:
   SQLStatementTest() : error_handler_(new StatementErrorHandler) {}
 
   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("SQLStatementTest.db")));
+
     // The |error_handler_| will be called if any sqlite statement operation
     // returns an error code.
     db_.set_error_delegate(error_handler_);
   }
 
   void TearDown() {
     // If any error happened the original sql statement can be found in
     // error_handler_->sql_statement().
     EXPECT_EQ(SQLITE_OK, error_handler_->error());
     db_.Close();
+
     // If this fails something is going on with cleanup and later tests may
     // fail, so we want to identify problems right away.
-    ASSERT_TRUE(file_util::Delete(path_, false));
+    ASSERT_TRUE(file_util::Delete(

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

Can be removed too.

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

Done.

+        temp_dir_.path().AppendASCII("SQLStatementTest.db"), false));
   }
 
   sql::Connection& db() { return db_; }
 
   int sqlite_error() const { return error_handler_->error(); }
   void reset_error() const { error_handler_->reset_error(); }
 
  private:
-  FilePath path_;
+  ScopedTempDir temp_dir_;
   sql::Connection db_;
   scoped_refptr<StatementErrorHandler> error_handler_;
 };
 
 TEST_F(SQLStatementTest, Assign) {
   sql::Statement s;
   EXPECT_FALSE(s);  // bool conversion operator.
   EXPECT_TRUE(!s);  // ! operator.
   EXPECT_FALSE(s.is_valid());
 
@@ skipping 40 matching lines @@
   // Insert in the foo table the primary key. It is an error to insert
   // something other than an number. This error causes the error callback
   // handler to be called with SQLITE_MISMATCH as error code.
   sql::Statement s(db().GetUniqueStatement("INSERT INTO foo (a) VALUES (?)"));
   EXPECT_TRUE(s.is_valid());
   s.BindCString(0, "bad bad");
   EXPECT_FALSE(s.Run());
   EXPECT_EQ(SQLITE_MISMATCH, sqlite_error());
   reset_error();
 }