Chromium Code Reviews| Index: content/browser/media/android/media_resource_getter_impl.cc |
| diff --git a/content/browser/media/android/media_resource_getter_impl.cc b/content/browser/media/android/media_resource_getter_impl.cc |
| index 53a5094dce4b8ace26192018f8e6ef633bf44ef4..22a9981bbdc69aea5578564a9ac1be4d247d3fad 100644 |
| --- a/content/browser/media/android/media_resource_getter_impl.cc |
| +++ b/content/browser/media/android/media_resource_getter_impl.cc |
| @@ -22,6 +22,9 @@ |
| #include "net/url_request/url_request_context_getter.h" |
| #include "url/gurl.h" |
| +using base::android::ConvertUTF8ToJavaString; |
| +using base::android::ScopedJavaLocalRef; |
| + |
| namespace content { |
| static void ReturnResultOnUIThread( |
| @@ -38,14 +41,17 @@ static void GetMediaMetadata( |
| const media::MediaResourceGetter::ExtractMediaMetadataCB& callback) { |
| JNIEnv* env = base::android::AttachCurrentThread(); |
| - base::android::ScopedJavaLocalRef<jstring> j_url_string = |
| - base::android::ConvertUTF8ToJavaString(env, url); |
| - base::android::ScopedJavaLocalRef<jstring> j_cookies = |
| - base::android::ConvertUTF8ToJavaString(env, cookies); |
| + ScopedJavaLocalRef<jstring> j_url_string = ConvertUTF8ToJavaString(env, url); |
| + ScopedJavaLocalRef<jstring> j_cookies = ConvertUTF8ToJavaString(env, cookies); |
| jobject j_context = base::android::GetApplicationContext(); |
| - base::android::ScopedJavaLocalRef<jobject> j_metadata = |
| - Java_MediaResourceGetter_extractMediaMetadata( |
| - env, j_context, j_url_string.obj(), j_cookies.obj()); |
| + ScopedJavaLocalRef<jstring> j_user_agent = ConvertUTF8ToJavaString( |
| + env, GetUserAgent(GURL(url))); |
|
qinmin
2014/01/09 04:48:44
you can pass useragent to GetMediaMetadata() from
Jinsuk Kim
2014/01/09 05:22:55
Done. See if this is done as you suggested.
|
| + ScopedJavaLocalRef<jobject> j_metadata = |
| + Java_MediaResourceGetter_extractMediaMetadata(env, |
| + j_context, |
| + j_url_string.obj(), |
| + j_cookies.obj(), |
| + j_user_agent.obj()); |
| BrowserThread::PostTask( |
| BrowserThread::UI, FROM_HERE, |
| base::Bind(callback, base::TimeDelta::FromMilliseconds( |