Move ScopedFILE to base namespace and scoped_file.h

chrome/browser/safe_browsing/safe_browsing_store_file.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 "chrome/browser/safe_browsing/safe_browsing_store_file.h"
 
+#include "base/file_util.h"
+#include "base/files/scoped_file.h"
 #include "base/md5.h"
 #include "base/metrics/histogram.h"
 
 namespace {
 
 // NOTE(shess): kFileMagic should not be a byte-wise palindrome, so
 // that byte-order changes force corruption.
 const int32 kFileMagic = 0x600D71FE;
 const int32 kFileVersion = 7;  // SQLite storage was 6...
 
@@ skipping 268 matching lines @@
 }
 
 bool SafeBrowsingStoreFile::WriteAddPrefix(int32 chunk_id, SBPrefix prefix) {
   add_prefixes_.push_back(SBAddPrefix(chunk_id, prefix));
   return true;
 }
 
 bool SafeBrowsingStoreFile::GetAddPrefixes(SBAddPrefixes* add_prefixes) {
   add_prefixes->clear();
 
-  file_util::ScopedFILE file(base::OpenFile(filename_, "rb"));
+  base::ScopedFILE file(base::OpenFile(filename_, "rb"));
   if (file.get() == NULL) return false;
 
   FileHeader header;
   if (!ReadAndVerifyHeader(filename_, file.get(), &header, NULL))
     return OnCorruptDatabase();
 
   size_t add_prefix_offset = header.add_chunk_count * sizeof(int32) +
       header.sub_chunk_count * sizeof(int32);
   if (!FileSkip(add_prefix_offset, file.get()))
     return false;
 
   if (!ReadToContainer(add_prefixes, header.add_prefix_count, file.get(), NULL))
     return false;
 
   return true;
 }
 
 bool SafeBrowsingStoreFile::GetAddFullHashes(
     std::vector<SBAddFullHash>* add_full_hashes) {
   add_full_hashes->clear();
 
-  file_util::ScopedFILE file(base::OpenFile(filename_, "rb"));
+  base::ScopedFILE file(base::OpenFile(filename_, "rb"));
   if (file.get() == NULL) return false;
 
   FileHeader header;
   if (!ReadAndVerifyHeader(filename_, file.get(), &header, NULL))
     return OnCorruptDatabase();
 
   size_t offset =
       header.add_chunk_count * sizeof(int32) +
       header.sub_chunk_count * sizeof(int32) +
       header.add_prefix_count * sizeof(SBAddPrefix) +
@@ skipping 62 matching lines @@
   DCHECK_EQ(chunks_written_, 0);
 
   // Since the following code will already hit the profile looking for
   // database files, this is a reasonable to time delete any old
   // files.
   CheckForOriginalAndDelete(filename_);
 
   corruption_seen_ = false;
 
   const base::FilePath new_filename = TemporaryFileForFilename(filename_);
-  file_util::ScopedFILE new_file(base::OpenFile(new_filename, "wb+"));
+  base::ScopedFILE new_file(base::OpenFile(new_filename, "wb+"));
   if (new_file.get() == NULL)
     return false;
 
-  file_util::ScopedFILE file(base::OpenFile(filename_, "rb"));
+  base::ScopedFILE file(base::OpenFile(filename_, "rb"));
   empty_ = (file.get() == NULL);
   if (empty_) {
     // If the file exists but cannot be opened, try to delete it (not
     // deleting directly, the bloom filter needs to be deleted, too).
     if (base::PathExists(filename_))
       return OnCorruptDatabase();
 
     new_file_.swap(new_file);
     return true;
   }
@@ skipping 327 matching lines @@
   // With SQLite support gone, one way to get to this code is if the
   // existing file is a SQLite file.  Make sure the journal file is
   // also removed.
   const base::FilePath journal_filename(
       basename.value() + FILE_PATH_LITERAL("-journal"));
   if (base::PathExists(journal_filename))
     base::DeleteFile(journal_filename, false);
 
   return true;
 }