revert r6938

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 686 matching lines @@
 ///////////////////////////////////////////////
 // MemoryMappedFile
 
 MemoryMappedFile::MemoryMappedFile()
     : file_(INVALID_HANDLE_VALUE),
       file_mapping_(INVALID_HANDLE_VALUE),
       data_(NULL),
       length_(INVALID_FILE_SIZE) {
 }
 
-MemoryMappedFile::~MemoryMappedFile() {
-  CloseHandles();
-}
-
-bool MemoryMappedFile::Initialize(const FilePath& file_name) {
-  if (IsValid())
-    return false;
-
-  if (!MapFileToMemory(file_name)) {
-    CloseHandles();
-    return false;
-  }
-
-  return true;
-}
-
 bool MemoryMappedFile::MapFileToMemory(const FilePath& file_name) {
   file_ = ::CreateFile(file_name.value().c_str(), GENERIC_READ,
                        FILE_SHARE_READ, NULL, OPEN_EXISTING,
                        FILE_ATTRIBUTE_NORMAL, NULL);
   if (file_ == INVALID_HANDLE_VALUE)
     return false;
 
   length_ = ::GetFileSize(file_, NULL);
   if (length_ == INVALID_FILE_SIZE)
     return false;
 
   file_mapping_ = ::CreateFileMapping(file_, NULL, PAGE_READONLY,
                                       0, length_, NULL);
   if (file_mapping_ == INVALID_HANDLE_VALUE)
     return false;
 
-  data_ = reinterpret_cast<const uint8*>(
+  data_ = static_cast<uint8*>(
       ::MapViewOfFile(file_mapping_, FILE_MAP_READ, 0, 0, length_));
   return data_ != NULL;
 }
 
-bool MemoryMappedFile::IsValid() {
-  return data_ != NULL;
-}
-
 void MemoryMappedFile::CloseHandles() {
   if (data_)
     ::UnmapViewOfFile(data_);
   if (file_mapping_ != INVALID_HANDLE_VALUE)
     ::CloseHandle(file_mapping_);
   if (file_ != INVALID_HANDLE_VALUE)
     ::CloseHandle(file_);
 
   data_ = NULL;
   file_mapping_ = file_ = INVALID_HANDLE_VALUE;
@@ skipping 11 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