Move more file_util functions to base namespace.

ui/base/resource/data_pack.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 "ui/base/resource/data_pack.h"
 
 #include <errno.h>
 
 #include "base/file_util.h"
 #include "base/files/memory_mapped_file.h"
@@ skipping 198 matching lines @@
 }
 
 ui::ScaleFactor DataPack::GetScaleFactor() const {
   return scale_factor_;
 }
 
 // static
 bool DataPack::WritePack(const base::FilePath& path,
                          const std::map<uint16, base::StringPiece>& resources,
                          TextEncodingType textEncodingType) {
-  FILE* file = file_util::OpenFile(path, "wb");
+  FILE* file = base::OpenFile(path, "wb");
   if (!file)
     return false;
 
   if (fwrite(&kFileFormatVersion, sizeof(kFileFormatVersion), 1, file) != 1) {
     LOG(ERROR) << "Failed to write file version";
-    file_util::CloseFile(file);
+    base::CloseFile(file);
     return false;
   }
 
   // Note: the python version of this function explicitly sorted keys, but
   // std::map is a sorted associative container, we shouldn't have to do that.
   uint32 entry_count = resources.size();
   if (fwrite(&entry_count, sizeof(entry_count), 1, file) != 1) {
     LOG(ERROR) << "Failed to write entry count";
-    file_util::CloseFile(file);
+    base::CloseFile(file);
     return false;
   }
 
   if (textEncodingType != UTF8 && textEncodingType != UTF16 &&
       textEncodingType != BINARY) {
     LOG(ERROR) << "Invalid text encoding type, got " << textEncodingType
                << ", expected between " << BINARY << " and " << UTF16;
-    file_util::CloseFile(file);
+    base::CloseFile(file);
     return false;
   }
 
   uint8 write_buffer = textEncodingType;
   if (fwrite(&write_buffer, sizeof(uint8), 1, file) != 1) {
     LOG(ERROR) << "Failed to write file text resources encoding";
-    file_util::CloseFile(file);
+    base::CloseFile(file);
     return false;
   }
 
   // Each entry is a uint16 + a uint32. We have an extra entry after the last
   // item so we can compute the size of the list item.
   uint32 index_length = (entry_count + 1) * sizeof(DataPackEntry);
   uint32 data_offset = kHeaderLength + index_length;
   for (std::map<uint16, base::StringPiece>::const_iterator it =
            resources.begin();
        it != resources.end(); ++it) {
     uint16 resource_id = it->first;
     if (fwrite(&resource_id, sizeof(resource_id), 1, file) != 1) {
       LOG(ERROR) << "Failed to write id for " << resource_id;
-      file_util::CloseFile(file);
+      base::CloseFile(file);
       return false;
     }
 
     if (fwrite(&data_offset, sizeof(data_offset), 1, file) != 1) {
       LOG(ERROR) << "Failed to write offset for " << resource_id;
-      file_util::CloseFile(file);
+      base::CloseFile(file);
       return false;
     }
 
     data_offset += it->second.length();
   }
 
   // We place an extra entry after the last item that allows us to read the
   // size of the last item.
   uint16 resource_id = 0;
   if (fwrite(&resource_id, sizeof(resource_id), 1, file) != 1) {
     LOG(ERROR) << "Failed to write extra resource id.";
-    file_util::CloseFile(file);
+    base::CloseFile(file);
     return false;
   }
 
   if (fwrite(&data_offset, sizeof(data_offset), 1, file) != 1) {
     LOG(ERROR) << "Failed to write extra offset.";
-    file_util::CloseFile(file);
+    base::CloseFile(file);
     return false;
   }
 
   for (std::map<uint16, base::StringPiece>::const_iterator it =
            resources.begin();
        it != resources.end(); ++it) {
     if (fwrite(it->second.data(), it->second.length(), 1, file) != 1) {
       LOG(ERROR) << "Failed to write data for " << it->first;
-      file_util::CloseFile(file);
+      base::CloseFile(file);
       return false;
     }
   }
 
-  file_util::CloseFile(file);
+  base::CloseFile(file);
 
   return true;
 }
 
 }  // namespace ui