Parsing filesystem url before giving it to media player

media/base/android/media_player_bridge.h

Index: media/base/android/media_player_bridge.h
diff --git a/media/base/android/media_player_bridge.h b/media/base/android/media_player_bridge.h
index bb3a655897eb1b0fb140081e84608b594c3a816c..8ac9b40e4ca3c585b68ef8ee1f253eb30b3776f0 100644
--- a/media/base/android/media_player_bridge.h
+++ b/media/base/android/media_player_bridge.h
@@ -13,14 +13,16 @@
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "base/string_util.h"

[palmer, 2013/03/18 19:54:34]

Do you need this?

[qinmin, 2013/03/18 22:27:59]

removed.
On 2013/03/18 19:54:34, Chris P. wrote:

 #include "base/time.h"
 #include "base/timer.h"
+#include "googleurl/src/gurl.h"
 #include "media/base/media_export.h"
 #include "media/base/android/media_player_listener.h"
 
 namespace media {
 
-class CookieGetter;
+class MediaResourceGetter;
 class MediaPlayerBridgeManager;
 
 // This class serves as a bridge for native code to call java functions inside
@@ -74,9 +76,9 @@ class MEDIA_EXPORT MediaPlayerBridge {
   // unused resources and free them when needed. On the other hand, it needs
   // to call ReleaseMediaResources() when it is done with decoding.
   MediaPlayerBridge(int player_id,
-                    const std::string& url,
-                    const std::string& first_party_for_cookies,
-                    CookieGetter* cookie_getter,
+                    const GURL& url,

[palmer, 2013/03/18 19:54:34]

Thanks for changing from string to GURL, btw.

+                    const GURL& first_party_for_cookies,
+                    MediaResourceGetter* resource_getter,
                     bool hide_url_log,
                     MediaPlayerBridgeManager* manager,
                     const MediaErrorCB& media_error_cb,
@@ -138,7 +140,7 @@ class MEDIA_EXPORT MediaPlayerBridge {
   // be called with an error type.
   void Prepare();
 
-  // Callback function passed to |cookies_retriever_|.
+  // Callback function passed to |resource_getter_|.
   void GetCookiesCallback(const std::string& cookies);
 
   int player_id() { return player_id_; }
@@ -151,6 +153,9 @@ class MEDIA_EXPORT MediaPlayerBridge {
   // Create the actual android media player.
   void InitializePlayer();
 
+  // Set the data source for the media player.
+  void SetDataSource(const std::string& url);
+
   // Functions that implements media player control.
   void StartInternal();
   void PauseInternal();
@@ -181,10 +186,10 @@ class MEDIA_EXPORT MediaPlayerBridge {
   base::TimeDelta pending_seek_;
 
   // Url for playback.
-  std::string url_;
+  GURL url_;
 
   // First party url for cookies.
-  std::string first_party_for_cookies_;
+  GURL first_party_for_cookies_;
 
   // Whether cookies are available.
   bool has_cookies_;
@@ -202,14 +207,14 @@ class MEDIA_EXPORT MediaPlayerBridge {
   bool can_seek_forward_;
   bool can_seek_backward_;
 
-  // Cookies for |url_|
+  // Cookies for |url_|.
   std::string cookies_;
 
   // Resource manager for all the media players.
   MediaPlayerBridgeManager* manager_;
 
-  // Object for retrieving cookies for this media player.
-  scoped_ptr<CookieGetter> cookie_getter_;
+  // Object for retrieving resources for this media player.
+  scoped_ptr<MediaResourceGetter> resource_getter_;
 
   // Java MediaPlayer instance.
   base::android::ScopedJavaGlobalRef<jobject> j_media_player_;