Parsing filesystem url before giving it to media player

webkit/media/android/webmediaplayer_in_process_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/media/android/webmediaplayer_in_process_android.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "media/base/android/media_player_bridge.h"
 #include "media/base/android/media_player_bridge_manager.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebCookieJar.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.h"
 #include "webkit/media/android/stream_texture_factory_android.h"
 #include "webkit/media/android/webmediaplayer_manager_android.h"
 
 using WebKit::WebMediaPlayerClient;
 using WebKit::WebMediaPlayer;
 using WebKit::WebURL;
 using media::MediaPlayerBridge;
 
 namespace webkit_media {
 
-InProcessCookieGetter::InProcessCookieGetter(WebKit::WebCookieJar* cookie_jar)
+InProcessMediaResourceGetter::InProcessMediaResourceGetter(
+    WebKit::WebCookieJar* cookie_jar)
     : cookie_jar_(cookie_jar) {
 }
 
-InProcessCookieGetter::~InProcessCookieGetter() {}
+InProcessMediaResourceGetter::~InProcessMediaResourceGetter() {}
 
-void InProcessCookieGetter::GetCookies(
-    const std::string& url,
-    const std::string& first_party_for_cookies,
+void InProcessMediaResourceGetter::GetCookies(
+    const GURL& url,
+    const GURL& first_party_for_cookies,
     const GetCookieCB& callback) {
   std::string cookies;
   if (cookie_jar_ != NULL) {
     cookies = UTF16ToUTF8(
-        cookie_jar_->cookies(GURL(url), GURL(first_party_for_cookies)));
+        cookie_jar_->cookies(url, first_party_for_cookies));
   }
   callback.Run(cookies);
 }
 
+void InProcessMediaResourceGetter::GetPlatformPathFromFileSystemURL(
+    const GURL& url, const GetPlatformPathCB& callback) {
+  callback.Run(std::string());
+}
+
 WebMediaPlayerInProcessAndroid::WebMediaPlayerInProcessAndroid(
     WebKit::WebFrame* frame,
     WebMediaPlayerClient* client,
     WebKit::WebCookieJar* cookie_jar,
     WebMediaPlayerManagerAndroid* manager,
     media::MediaPlayerBridgeManager* resource_manager,
     StreamTextureFactory* factory,
     bool disable_media_history_logging)
     : WebMediaPlayerAndroid(client, manager, factory),
       frame_(frame),
@@ skipping 74 matching lines @@
   OnBufferingUpdate(percent);
 }
 
 void WebMediaPlayerInProcessAndroid::SetVideoSurface(jobject j_surface) {
   media_player_->SetVideoSurface(j_surface);
 }
 
 void WebMediaPlayerInProcessAndroid::InitializeMediaPlayer(GURL url) {
   GURL first_party_url = frame_->document().firstPartyForCookies();
   media_player_.reset(new MediaPlayerBridge(
-      player_id(), url.spec(), first_party_url.spec(),
-      new InProcessCookieGetter(cookie_jar_),
+      player_id(), url, first_party_url,
+      new InProcessMediaResourceGetter(cookie_jar_),
       disable_history_logging_,
       resource_manager_,
       base::Bind(&WebMediaPlayerInProcessAndroid::MediaErrorCallback,
                  base::Unretained(this)),
       base::Bind(&WebMediaPlayerInProcessAndroid::VideoSizeChangedCallback,
                  base::Unretained(this)),
       base::Bind(&WebMediaPlayerInProcessAndroid::BufferingUpdateCallback,
                  base::Unretained(this)),
       base::Bind(&WebMediaPlayerInProcessAndroid::MediaPreparedCallback,
                  base::Unretained(this)),
@@ skipping 24 matching lines @@
   UpdateReadyState(WebMediaPlayer::ReadyStateHaveMetadata);
   UpdateReadyState(WebMediaPlayer::ReadyStateHaveEnoughData);
 }
 
 void WebMediaPlayerInProcessAndroid::OnTimeUpdate(
     base::TimeDelta current_time) {}
 
 void WebMediaPlayerInProcessAndroid::Destroy() {}
 
 }  // namespace webkit_media