Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1961)

Unified Diff: chrome/browser/media/android/remote/remote_media_player_bridge.cc

Issue 1907413002: [Android,MediaFling] Fix the encoding issue with already encoded URLs for abc13.com/live (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated test cases Created 4 years, 8 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: chrome/browser/media/android/remote/remote_media_player_bridge.cc
diff --git a/chrome/browser/media/android/remote/remote_media_player_bridge.cc b/chrome/browser/media/android/remote/remote_media_player_bridge.cc
index d33a3312edc06e273e11b8fed85f46f214501d08..d068dadca3dacaccb1f922181dbd04ac67d14123 100644
--- a/chrome/browser/media/android/remote/remote_media_player_bridge.cc
+++ b/chrome/browser/media/android/remote/remote_media_player_bridge.cc
@@ -17,6 +17,7 @@
#include "media/base/android/media_common_android.h"
#include "media/base/android/media_resource_getter.h"
#include "media/base/timestamp_constants.h"
+#include "net/base/escape.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/gfx/android/java_bitmap.h"
@@ -65,8 +66,11 @@ RemoteMediaPlayerBridge::RemoteMediaPlayerBridge(
CHECK(env);
ScopedJavaLocalRef<jstring> j_url_string;
if (url_.is_valid()) {
+ // Escape the URL to make it safe to use. Don't escape existing escape
+ // sequences though.
+ std::string escaped_url = net::EscapeExternalHandlerValue(url_.spec());
// Create a Java String for the URL.
- j_url_string = ConvertUTF8ToJavaString(env, url_.spec());
+ j_url_string = ConvertUTF8ToJavaString(env, escaped_url);
}
ScopedJavaLocalRef<jstring> j_frame_url_string;
GURL frameUrl = GetLocalPlayer()->frame_url();

Powered by Google App Engine
This is Rietveld 408576698