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_frame | |
| 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_frame')
| -rw-r--r-- | chrome_frame/test/navigation_test.cc | 1 | ||||
| -rw-r--r-- | chrome_frame/test/test_server.cc | 5 | ||||
| -rw-r--r-- | chrome_frame/test/test_server.h | 5 | ||||
| -rw-r--r-- | chrome_frame/test/test_with_web_server.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/test/ui_test.cc | 1 |
5 files changed, 10 insertions, 4 deletions
diff --git a/chrome_frame/test/navigation_test.cc b/chrome_frame/test/navigation_test.cc index d85edfa..4f83743 100644 --- a/chrome_frame/test/navigation_test.cc +++ b/chrome_frame/test/navigation_test.cc @@ -4,6 +4,7 @@ #include <string> +#include "base/file_util.h" #include "base/test/test_file_util.h" #include "base/win/scoped_comptr.h" #include "base/win/windows_version.h" diff --git a/chrome_frame/test/test_server.cc b/chrome_frame/test/test_server.cc index cca7fe3..643b8ca 100644 --- a/chrome_frame/test/test_server.cc +++ b/chrome_frame/test/test_server.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome_frame/test/test_server.h" + #include <windows.h> #include <objbase.h> #include <urlmon.h> @@ -14,7 +16,6 @@ #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "chrome_frame/test/chrome_frame_test_utils.h" -#include "chrome_frame/test/test_server.h" #include "net/base/tcp_listen_socket.h" #include "net/base/winsock_init.h" #include "net/http/http_util.h" @@ -117,7 +118,7 @@ void FileResponse::WriteContents(net::StreamListenSocket* socket) const { size_t FileResponse::ContentLength() const { if (file_.get() == NULL) { - file_.reset(new file_util::MemoryMappedFile()); + file_.reset(new base::MemoryMappedFile()); if (!file_->Initialize(file_path_)) { NOTREACHED(); file_.reset(); diff --git a/chrome_frame/test/test_server.h b/chrome_frame/test/test_server.h index 48fd4b7..d4f9281 100644 --- a/chrome_frame/test/test_server.h +++ b/chrome_frame/test/test_server.h @@ -39,7 +39,8 @@ #include <string> #include "base/basictypes.h" -#include "base/file_util.h" +#include "base/file_path.h" +#include "base/files/memory_mapped_file.h" #include "base/message_loop.h" #include "net/base/stream_listen_socket.h" @@ -251,7 +252,7 @@ class FileResponse : public ResponseForPath { protected: base::FilePath file_path_; - mutable scoped_ptr<file_util::MemoryMappedFile> file_; + mutable scoped_ptr<base::MemoryMappedFile> file_; private: DISALLOW_COPY_AND_ASSIGN(FileResponse); diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc index 5247426..23dcc64 100644 --- a/chrome_frame/test/test_with_web_server.cc +++ b/chrome_frame/test/test_with_web_server.cc @@ -5,7 +5,9 @@ #include "chrome_frame/test/test_with_web_server.h" #include "base/base_paths.h" +#include "base/file_util.h" #include "base/file_version_info.h" +#include "base/files/memory_mapped_file.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "base/stringprintf.h" diff --git a/chrome_frame/test/ui_test.cc b/chrome_frame/test/ui_test.cc index 65112af..275f34c 100644 --- a/chrome_frame/test/ui_test.cc +++ b/chrome_frame/test/ui_test.cc @@ -5,6 +5,7 @@ #include <mshtmcid.h> #include <string> +#include "base/file_util.h" #include "base/test/test_file_util.h" #include "base/utf_string_conversions.h" #include "base/win/scoped_bstr.h" |