diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-24 21:55:45 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-24 21:55:45 +0000 |
| commit | c3088cbb5cbd5c91b6c5602750ec327ff7963862 (patch) | |
| tree | 4aac06d2b2541d9ef2744f719478f6c2c88b00c1 /chrome/installer | |
| parent | 47e870bf26f0c01dafe611ec03c0139c735063df (diff) | |
| download | chromium_src-c3088cbb5cbd5c91b6c5602750ec327ff7963862.zip chromium_src-c3088cbb5cbd5c91b6c5602750ec327ff7963862.tar.gz chromium_src-c3088cbb5cbd5c91b6c5602750ec327ff7963862.tar.bz2 | |
base: Move MemoryMappedFile out of file_util.h and into its own header file.
BUG=175002
TEST=base_unittests
R=brettw@chromium.org
TBR=erikwright@chromium.org,tommi@chromium.org,fischman@chromium.org,ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12321062
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184356 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/test/resource_updater.cc | 4 | ||||
| -rw-r--r-- | chrome/installer/util/move_tree_work_item_unittest.cc | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/chrome/installer/test/resource_updater.cc b/chrome/installer/test/resource_updater.cc index c308add..cf05094 100644 --- a/chrome/installer/test/resource_updater.cc +++ b/chrome/installer/test/resource_updater.cc @@ -6,8 +6,8 @@ #include <windows.h> -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/memory_mapped_file.h" #include "base/logging.h" namespace upgrade_test { @@ -39,7 +39,7 @@ bool ResourceUpdater::Update(const std::wstring& name, WORD language_id, const base::FilePath& input_file) { DCHECK(handle_ != NULL); - file_util::MemoryMappedFile input; + base::MemoryMappedFile input; if (input.Initialize(input_file)) { if (UpdateResource(handle_, type.c_str(), name.c_str(), language_id, diff --git a/chrome/installer/util/move_tree_work_item_unittest.cc b/chrome/installer/util/move_tree_work_item_unittest.cc index bead46e..47b2729 100644 --- a/chrome/installer/util/move_tree_work_item_unittest.cc +++ b/chrome/installer/util/move_tree_work_item_unittest.cc @@ -8,6 +8,7 @@ #include "base/base_paths.h" #include "base/file_util.h" +#include "base/files/memory_mapped_file.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/process_util.h" @@ -412,7 +413,7 @@ TEST_F(MoveTreeWorkItemTest, MoveDirectoryDestExistsCheckForDuplicatesFull) { // Lock one of the files in the to destination directory to prevent moves. base::FilePath orig_to_file( to_dir.AppendASCII("From_Dir2").AppendASCII("From_File")); - file_util::MemoryMappedFile mapped_file; + base::MemoryMappedFile mapped_file; EXPECT_TRUE(mapped_file.Initialize(orig_to_file)); // First check that we can't do the regular Move(). |