Move ScopedFILE to base namespace and scoped_file.h

chrome/browser/safe_browsing/prefix_set.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/prefix_set.h"
 
 #include <algorithm>
 #include <math.h>
 
 #include "base/file_util.h"
+#include "base/files/scoped_file.h"
 #include "base/logging.h"
 #include "base/md5.h"
 #include "base/metrics/histogram.h"
 
 namespace {
 
 // |kMagic| should be reasonably unique, and not match itself across
 // endianness changes.  I generated this value with:
 // md5 -qs chrome/browser/safe_browsing/prefix_set.cc | colrm 9
 static uint32 kMagic = 0x864088dd;
@@ skipping 137 matching lines @@
 
 // static
 PrefixSet* PrefixSet::LoadFile(const base::FilePath& filter_name) {
   int64 size_64;
   if (!base::GetFileSize(filter_name, &size_64))
     return NULL;
   using base::MD5Digest;
   if (size_64 < static_cast<int64>(sizeof(FileHeader) + sizeof(MD5Digest)))
     return NULL;
 
-  file_util::ScopedFILE file(base::OpenFile(filter_name, "rb"));
+  base::ScopedFILE file(base::OpenFile(filter_name, "rb"));
   if (!file.get())
     return NULL;
 
   FileHeader header;
   size_t read = fread(&header, sizeof(header), 1, file.get());
   if (read != 1)
     return NULL;
 
   // TODO(shess): Version 1 and 2 use the same file structure, with version 1
   // data using a signed sort.  For M-35, the data is re-sorted before return.
@@ skipping 75 matching lines @@
   header.index_size = static_cast<uint32>(index_.size());
   header.deltas_size = static_cast<uint32>(deltas_.size());
 
   // Sanity check that the 32-bit values never mess things up.
   if (static_cast<size_t>(header.index_size) != index_.size() ||
       static_cast<size_t>(header.deltas_size) != deltas_.size()) {
     NOTREACHED();
     return false;
   }
 
-  file_util::ScopedFILE file(base::OpenFile(filter_name, "wb"));
+  base::ScopedFILE file(base::OpenFile(filter_name, "wb"));
   if (!file.get())
     return false;
 
   base::MD5Context context;
   base::MD5Init(&context);
 
   // TODO(shess): The I/O code in safe_browsing_store_file.cc would
   // sure be useful about now.
   size_t written = fwrite(&header, sizeof(header), 1, file.get());
   if (written != 1)
@@ skipping 33 matching lines @@
   if (written != 1)
     return false;
 
   // TODO(shess): Can this code check that the close was successful?
   file.reset();
 
   return true;
 }
 
 }  // namespace safe_browsing