Index: media/base/android/media_player_bridge.cc |
diff --git a/media/base/android/media_player_bridge.cc b/media/base/android/media_player_bridge.cc |
index 225d103548503e796049f2417b5cf6d449c8237b..02dd553b582952d548e63aaf399f71c53b0cbc9e 100644 |
--- a/media/base/android/media_player_bridge.cc |
+++ b/media/base/android/media_player_bridge.cc |
@@ -9,6 +9,7 @@ |
#include "base/android/context_utils.h" |
#include "base/android/jni_android.h" |
#include "base/android/jni_string.h" |
+#include "base/android/scoped_java_ref.h" |
#include "base/logging.h" |
#include "base/metrics/histogram_macros.h" |
#include "base/strings/string_util.h" |
@@ -21,6 +22,7 @@ |
using base::android::ConvertUTF8ToJavaString; |
using base::android::JavaParamRef; |
+using base::android::JavaRef; |
using base::android::ScopedJavaLocalRef; |
namespace media { |
@@ -123,7 +125,7 @@ void MediaPlayerBridge::CreateJavaMediaPlayerBridge() { |
UpdateEffectiveVolume(); |
- AttachListener(j_media_player_bridge_.obj()); |
+ AttachListener(j_media_player_bridge_); |
} |
void MediaPlayerBridge::SetDuration(base::TimeDelta duration) { |
@@ -178,8 +180,7 @@ void MediaPlayerBridge::SetDataSource(const std::string& url) { |
ScopedJavaLocalRef<jstring> j_url_string = |
ConvertUTF8ToJavaString(env, url); |
- jobject j_context = base::android::GetApplicationContext(); |
- DCHECK(j_context); |
+ const JavaRef<jobject>& j_context = base::android::GetApplicationContext(); |
const std::string data_uri_prefix("data:"); |
if (base::StartsWith(url, data_uri_prefix, base::CompareCase::SENSITIVE)) { |