Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6716)

Unified Diff: chrome_frame/test/test_server.cc

Issue 12321062: base: Move MemoryMappedFile out of file_util.h and into its own header file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix chrome_frame Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome_frame/test/test_server.cc
diff --git a/chrome_frame/test/test_server.cc b/chrome_frame/test/test_server.cc
index cca7fe3b428ec16b518e49ac3196bb39311d841b..eb0674e3451266043bb7198bc0693203e000263c 100644
--- a/chrome_frame/test/test_server.cc
+++ b/chrome_frame/test/test_server.cc
@@ -2,11 +2,14 @@
// 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>
#include "base/bind.h"
+#include "base/files/memory_mapped_file.h"
#include "base/logging.h"
#include "base/string_number_conversions.h"
#include "base/string_piece.h"
@@ -14,7 +17,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 +119,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();

Powered by Google App Engine
This is Rietveld 408576698