Revert 167638 - Reimplement FileDataSource using file_util::MemoryMappedFile and convert to using FilePath.

Review URL: https://chromiumcodereview.appspot.com/11360229

TBR=scherkus@chromium.org
Review URL: https://codereview.chromium.org/11361258

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

4 files changed, 7 insertions, 7 deletions

diff --git a/media/tools/player_wtl/movie.cc b/media/tools/player_wtl/movie.cc
index 255f2d0..3029da9 100644
--- a/media/tools/player_wtl/movie.cc
+++ b/media/tools/player_wtl/movie.cc
@@ -53,7 +53,7 @@ void Movie::SetFrameBuffer(HBITMAP hbmp, HWND hwnd) {
   movie_hwnd_ = hwnd;
 }
 
-bool Movie::Open(const wchar_t* file_path, VideoRendererBase* video_renderer) {
+bool Movie::Open(const wchar_t* url, VideoRendererBase* video_renderer) {
   // Close previous movie.
   if (pipeline_) {
     Close();
@@ -67,8 +67,9 @@ bool Movie::Open(const wchar_t* file_path, VideoRendererBase* video_renderer) {
   pipeline_ = new Pipeline(pipeline_loop, new media::MediaLog());
 
   // Open the file.
+  std::string url_utf8 = WideToUTF8(string16(url));
   scoped_refptr<FileDataSource> data_source = new FileDataSource();
-  if (!data_source->Initialize(FilePath(file_path)) {
+  if (!data_source->Initialize(url_utf8)) {
     return false;
   }
 
diff --git a/media/tools/player_wtl/movie.h b/media/tools/player_wtl/movie.h
index 7414407..0e04278 100644
--- a/media/tools/player_wtl/movie.h
+++ b/media/tools/player_wtl/movie.h
@@ -27,7 +27,7 @@ class Movie {
   static Movie* GetInstance();
 
   // Open a movie.
-  bool Open(const wchar_t* file_path, VideoRendererBase* video_renderer);
+  bool Open(const wchar_t* url, VideoRendererBase* video_renderer);
 
   // Set playback rate.
   void Play(float rate);
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc
index 08e6371..b1c814e 100644
--- a/media/tools/player_x11/player_x11.cc
+++ b/media/tools/player_x11/player_x11.cc
@@ -47,10 +47,10 @@ media::AudioManager* g_audio_manager = NULL;
 media::VideoRendererBase* g_video_renderer = NULL;
 
 scoped_refptr<media::FileDataSource> CreateFileDataSource(
-    const std::string& file_path) {
+    const std::string& file) {
   scoped_refptr<media::FileDataSource> file_data_source(
       new media::FileDataSource());
-  CHECK(file_data_source->Initialize(FilePath(file_path)));
+  CHECK(file_data_source->Initialize(file));
   return file_data_source;
 }
 
diff --git a/media/tools/seek_tester/seek_tester.cc b/media/tools/seek_tester/seek_tester.cc
index 2bed876..69d7b2e 100644
--- a/media/tools/seek_tester/seek_tester.cc
+++ b/media/tools/seek_tester/seek_tester.cc
@@ -16,7 +16,6 @@
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/logging.h"
-#include "base/file_path.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "media/base/media.h"
@@ -62,7 +61,7 @@ int main(int argc, char** argv) {
   CHECK(base::StringToUint64(argv[2], &seek_target_ms));
   scoped_refptr<media::FileDataSource> file_data_source(
       new media::FileDataSource());
-  CHECK(file_data_source->Initialize(FilePath::FromUTF8Unsafe(argv[1])));
+  CHECK(file_data_source->Initialize(argv[1]));
 
   DemuxerHostImpl host;
   MessageLoop loop;