Safe browsing cleanup:...

base/file_util_win.cc

 // Copyright (c) 2006-2008 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/file_util.h"
 
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
 #include <time.h>
@@ skipping 479 matching lines @@
 }
 
 FILE* OpenFile(const std::string& filename, const char* mode) {
   FILE* file;
   if (fopen_s(&file, filename.c_str(), mode) != 0) {
     return NULL;
   }
   return file;
 }
 
-int ReadFile(const std::wstring& filename, char* data, int size) {
-  ScopedHandle file(CreateFile(filename.c_str(),
+int ReadFile(const FilePath& filename, char* data, int size) {
+  ScopedHandle file(CreateFile(filename.value().c_str(),
                                GENERIC_READ,
                                FILE_SHARE_READ | FILE_SHARE_WRITE,
                                NULL,
                                OPEN_EXISTING,
                                FILE_FLAG_SEQUENTIAL_SCAN,
                                NULL));
   if (file == INVALID_HANDLE_VALUE)
     return -1;
 
   int ret_value;
   DWORD read;
   if (::ReadFile(file, data, size, &read, NULL) && read == size) {
     ret_value = static_cast<int>(read);
   } else {
     ret_value = -1;
   }
 
   return ret_value;
 }
 
-int WriteFile(const std::wstring& filename, const char* data, int size) {
-  ScopedHandle file(CreateFile(filename.c_str(),
+int WriteFile(const FilePath& filename, const char* data, int size) {
+  ScopedHandle file(CreateFile(filename.value().c_str(),
                                GENERIC_WRITE,
                                0,
                                NULL,
                                CREATE_ALWAYS,
                                0,
                                NULL));
   if (file == INVALID_HANDLE_VALUE) {
-    LOG(WARNING) << "CreateFile failed for path " << filename <<
+    LOG(WARNING) << "CreateFile failed for path " << filename.value() <<
         " error code=" << GetLastError() <<
         " error text=" << win_util::FormatLastWin32Error();
     return -1;
   }
 
   DWORD written;
   BOOL result = ::WriteFile(file, data, size, &written, NULL);
   if (result && written == size)
     return static_cast<int>(written);
 
   if (!result) {
     // WriteFile failed.
-    LOG(WARNING) << "writing file " << filename <<
+    LOG(WARNING) << "writing file " << filename.value() <<
         " failed, error code=" << GetLastError() <<
         " description=" << win_util::FormatLastWin32Error();
   } else {
     // Didn't write all the bytes.
-    LOG(WARNING) << "wrote" << written << " bytes to " << filename <<
-        " expected " << size;
+    LOG(WARNING) << "wrote" << written << " bytes to " <<
+        filename.value() << " expected " << size;
   }
   return -1;
 }
 
 bool RenameFileAndResetSecurityDescriptor(const FilePath& source_file_path,
                                           const FilePath& target_file_path) {
   // The parameters to SHFileOperation must be terminated with 2 NULL chars.
   std::wstring source = source_file_path.value();
   std::wstring target = target_file_path.value();
 
@@ skipping 190 matching lines @@
 void PathComponents(const std::wstring& path,
                     std::vector<std::wstring>* components) {
   PathComponents(FilePath(path), components);
 }
 void ReplaceExtension(std::wstring* file_name, const std::wstring& extension) {
   FilePath path(*file_name);
   ReplaceExtension(&path, extension);
   file_name->assign(path.value());
 }
 }  // namespace file_util