Move ScopedFILE to base namespace and scoped_file.h

sql/connection_unittest.cc

 // Copyright (c) 2012 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/bind.h"
 #include "base/file_util.h"
+#include "base/files/scoped_file.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "sql/connection.h"
 #include "sql/meta_table.h"
 #include "sql/statement.h"
 #include "sql/test/error_callback_support.h"
 #include "sql/test/scoped_error_ignorer.h"
 #include "sql/test/test_helpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/sqlite/sqlite3.h"
@@ skipping 399 matching lines @@
 }
 
 // Verify that Raze() can handle an empty file.  SQLite should treat
 // this as an empty database.
 TEST_F(SQLConnectionTest, RazeEmptyDB) {
   const char* kCreateSql = "CREATE TABLE foo (id INTEGER PRIMARY KEY, value)";
   ASSERT_TRUE(db().Execute(kCreateSql));
   db().Close();
 
   {
-    file_util::ScopedFILE file(base::OpenFile(db_path(), "rb+"));
+    base::ScopedFILE file(base::OpenFile(db_path(), "rb+"));
     ASSERT_TRUE(file.get() != NULL);
     ASSERT_EQ(0, fseek(file.get(), 0, SEEK_SET));
     ASSERT_TRUE(base::TruncateFile(file.get()));
   }
 
   ASSERT_TRUE(db().Open(db_path()));
   ASSERT_TRUE(db().Raze());
   EXPECT_EQ(0, SqliteMasterCount(&db()));
 }
 
 // Verify that Raze() can handle a file of junk.
 TEST_F(SQLConnectionTest, RazeNOTADB) {
   db().Close();
   sql::Connection::Delete(db_path());
   ASSERT_FALSE(base::PathExists(db_path()));
 
   {
-    file_util::ScopedFILE file(base::OpenFile(db_path(), "wb"));
+    base::ScopedFILE file(base::OpenFile(db_path(), "wb"));
     ASSERT_TRUE(file.get() != NULL);
 
     const char* kJunk = "This is the hour of our discontent.";
     fputs(kJunk, file.get());
   }
   ASSERT_TRUE(base::PathExists(db_path()));
 
   // SQLite will successfully open the handle, but will fail with
   // SQLITE_IOERR_SHORT_READ on pragma statemenets which read the
   // header.
@@ skipping 12 matching lines @@
 }
 
 // Verify that Raze() can handle a database overwritten with garbage.
 TEST_F(SQLConnectionTest, RazeNOTADB2) {
   const char* kCreateSql = "CREATE TABLE foo (id INTEGER PRIMARY KEY, value)";
   ASSERT_TRUE(db().Execute(kCreateSql));
   ASSERT_EQ(1, SqliteMasterCount(&db()));
   db().Close();
 
   {
-    file_util::ScopedFILE file(base::OpenFile(db_path(), "rb+"));
+    base::ScopedFILE file(base::OpenFile(db_path(), "rb+"));
     ASSERT_TRUE(file.get() != NULL);
     ASSERT_EQ(0, fseek(file.get(), 0, SEEK_SET));
 
     const char* kJunk = "This is the hour of our discontent.";
     fputs(kJunk, file.get());
   }
 
   // SQLite will successfully open the handle, but will fail with
   // SQLITE_NOTADB on pragma statemenets which attempt to read the
   // corrupted header.
@@ skipping 372 matching lines @@
     EXPECT_LT(1u, messages.size());
     EXPECT_NE(kOk, messages[0]);
     ASSERT_TRUE(ignore_errors.CheckIgnoredErrors());
   }
 
   // TODO(shess): CorruptTableOrIndex could be used to produce a
   // file that would pass the quick check and fail the full check.
 }
 
 }  // namespace