Reimplement FileDataSource using file_util::MemoryMappedFile and convert to using FilePath.

This time without breaking the build!

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167691 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 5 insertions, 4 deletions

diff --git a/media/base/test_data_util.cc b/media/base/test_data_util.cc
index 4cba4a8..134655d 100644
--- a/media/base/test_data_util.cc
+++ b/media/base/test_data_util.cc
@@ -11,7 +11,7 @@
 
 namespace media {
 
-std::string GetTestDataURL(const std::string& name) {
+FilePath GetTestDataFilePath(const std::string& name) {
   FilePath file_path;
   CHECK(PathService::Get(base::DIR_SOURCE_ROOT, &file_path));
 
@@ -19,7 +19,7 @@ std::string GetTestDataURL(const std::string& name) {
       .Append(FILE_PATH_LITERAL("test"))
       .Append(FILE_PATH_LITERAL("data"))
       .AppendASCII(name);
-  return file_path.MaybeAsASCII();
+  return file_path;
 }
 
 scoped_refptr<DecoderBuffer> ReadTestDataFile(const std::string& name) {
diff --git a/media/base/test_data_util.h b/media/base/test_data_util.h
index 81efa80..062bbda 100644
--- a/media/base/test_data_util.h
+++ b/media/base/test_data_util.h
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 
@@ -15,8 +16,8 @@ namespace media {
 
 class DecoderBuffer;
 
-// Returns a URL path for a file in the media/test/data directory.
-std::string GetTestDataURL(const std::string& name);
+// Returns a file path for a file in the media/test/data directory.
+FilePath GetTestDataFilePath(const std::string& name);
 
 // Reads a test file from media/test/data directory and stores it in
 // a DecoderBuffer.  Use DecoderBuffer vs DataBuffer to ensure no matter