Move ScopedFILE to base namespace and scoped_file.h

sql/test/test_helpers.cc

 // Copyright 2013 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 "sql/test/test_helpers.h"
 
 #include <string>
 
 #include "base/file_util.h"
+#include "base/files/scoped_file.h"
 #include "sql/connection.h"
 #include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 size_t CountSQLItemsOfType(sql::Connection* db, const char* type) {
   const char kTypeSQL[] = "SELECT COUNT(*) FROM sqlite_master WHERE type = ?";
   sql::Statement s(db->GetUniqueStatement(kTypeSQL));
   s.BindCString(0, type);
@@ skipping 48 matching lines @@
 bool CorruptSizeInHeader(const base::FilePath& db_path) {
   // See http://www.sqlite.org/fileformat.html#database_header
   const size_t kHeaderSize = 100;
   const size_t kPageSizeOffset = 16;
   const size_t kFileChangeCountOffset = 24;
   const size_t kPageCountOffset = 28;
   const size_t kVersionValidForOffset = 92;  // duplicate kFileChangeCountOffset
 
   unsigned char header[kHeaderSize];
 
-  file_util::ScopedFILE file(base::OpenFile(db_path, "rb+"));
+  base::ScopedFILE file(base::OpenFile(db_path, "rb+"));
   if (!file.get())
     return false;
 
   if (0 != fseek(file.get(), 0, SEEK_SET))
     return false;
   if (1u != fread(header, sizeof(header), 1, file.get()))
     return false;
 
   int64 db_size = 0;
   if (!base::GetFileSize(db_path, &db_size))
@@ skipping 32 matching lines @@
 
   int page_number = 0;
   if (!GetRootPage(&db, tree_name, &page_number))
     return false;
 
   // SQLite uses 1-based page numbering.
   const long int page_ofs = (page_number - 1) * page_size;
   scoped_ptr<char[]> page_buf(new char[page_size]);
 
   // Get the page into page_buf.
-  file_util::ScopedFILE file(base::OpenFile(db_path, "rb+"));
+  base::ScopedFILE file(base::OpenFile(db_path, "rb+"));
   if (!file.get())
     return false;
   if (0 != fseek(file.get(), page_ofs, SEEK_SET))
     return false;
   if (1u != fread(page_buf.get(), page_size, 1, file.get()))
     return false;
 
   // Require the page to be a leaf node.  A multilevel tree would be
   // very hard to restore correctly.
   if (page_buf[0] != 0xD && page_buf[0] != 0xA)
@@ skipping 99 matching lines @@
   sql::Statement statement(db->GetUniqueStatement("PRAGMA integrity_check"));
 
   // SQLite should always return a row of data.
   EXPECT_TRUE(statement.Step());
 
   return statement.ColumnString(0);
 }
 
 }  // namespace test
 }  // namespace sql