base: Move MemoryMappedFile out of file_util.h and into its own header file.

courgette/ensemble_apply.cc

 // Copyright (c) 2011 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.
 
 // This file contains the code to apply a Courgette patch.
 
 #include "courgette/ensemble.h"
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
+#include "base/files/memory_mapped_file.h"
 #include "base/logging.h"
-
 #include "courgette/crc.h"
 #include "courgette/region.h"
 #include "courgette/streams.h"
 #include "courgette/simple_delta.h"
 #include "courgette/patcher_x86_32.h"
 
 namespace courgette {
 
 // EnsemblePatchApplication is all the logic and data required to apply the
 // multi-stage patch.
@@ skipping 348 matching lines @@
 
   return C_OK;
 }
 
 Status ApplyEnsemblePatch(const base::FilePath::CharType* old_file_name,
                           const base::FilePath::CharType* patch_file_name,
                           const base::FilePath::CharType* new_file_name) {
   // First read enough of the patch file to validate the header is well-formed.
   // A few varint32 numbers should fit in 100.
   base::FilePath patch_file_path(patch_file_name);
-  file_util::MemoryMappedFile patch_file;
+  base::MemoryMappedFile patch_file;
   if (!patch_file.Initialize(patch_file_path))
     return C_READ_OPEN_ERROR;
 
   // 'Dry-run' the first step of the patch process to validate format of header.
   SourceStream patch_header_stream;
   patch_header_stream.Init(patch_file.data(), patch_file.length());
   EnsemblePatchApplication patch_process;
   Status status = patch_process.ReadHeader(&patch_header_stream);
   if (status != C_OK)
     return status;
 
   // Read the old_file.
   base::FilePath old_file_path(old_file_name);
-  file_util::MemoryMappedFile old_file;
+  base::MemoryMappedFile old_file;
   if (!old_file.Initialize(old_file_path))
     return C_READ_ERROR;
 
   // Apply patch on streams.
   SourceStream old_source_stream;
   SourceStream patch_source_stream;
   old_source_stream.Init(old_file.data(), old_file.length());
   patch_source_stream.Init(patch_file.data(), patch_file.length());
   SinkStream new_sink_stream;
   status = ApplyEnsemblePatch(&old_source_stream, &patch_source_stream,
@@ skipping 10 matching lines @@
           static_cast<int>(new_sink_stream.Length()));
   if (written == -1)
     return C_WRITE_OPEN_ERROR;
   if (static_cast<size_t>(written) != new_sink_stream.Length())
     return C_WRITE_ERROR;
 
   return C_OK;
 }
 
 }  // namespace