media/ffmpeg/ffmpeg_unittest.cc - Issue 12321062: base: Move MemoryMappedFile out of file_util.h and into its own header file.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/ffmpeg/ffmpeg_unittest.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: media/ffmpeg/ffmpeg_unittest.cc

diff --git a/media/ffmpeg/ffmpeg_unittest.cc b/media/ffmpeg/ffmpeg_unittest.cc

index f1653c4a9cff62018795c0aab54041ee038e27da..0b0a3e9f234f1b560f55a24fd6541f4c4d3bd5aa 100644

--- a/media/ffmpeg/ffmpeg_unittest.cc

+++ b/media/ffmpeg/ffmpeg_unittest.cc

@@ -14,6 +14,7 @@

#include "base/base_paths.h"

#include "base/file_path.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/perftimer.h"

@@ -392,7 +393,7 @@ class FFmpegTest : public testing::TestWithParam<const char*> {

int64 decoded_video_duration_;

int64 duration_;

- file_util::MemoryMappedFile file_data_;

+ base::MemoryMappedFile file_data_;

scoped_ptr<InMemoryUrlProtocol> protocol_;

scoped_ptr<FFmpegGlue> glue_;

« chrome/installer/test/resource_updater.cc ('K') | « courgette/ensemble_apply.cc ('k') | media/filters/file_data_source.h » ('j') | no next file with comments »