From 235020dba690aef0fcf4c25a532fde48a27ae2d1 Mon Sep 17 00:00:00 2001 From: magjed Date: Thu, 18 Aug 2016 01:45:45 -0700 Subject: [PATCH] Roll chromium_revision 915e47250f..e3860bd297 (412201:412289) Change log: https://chromium.googlesource.com/chromium/src/+log/915e47250f..e3860bd297 Full diff: https://chromium.googlesource.com/chromium/src/+/915e47250f..e3860bd297 No dependencies changed. No update to Clang. NOTRY=TRUE TBR= BUG=webrtc:6219 Review-Url: https://codereview.webrtc.org/2253973002 Cr-Commit-Position: refs/heads/master@{#13809} --- DEPS | 2 +- webrtc/api/test/androidtestinitializer.cc | 2 +- webrtc/modules/audio_device/android/ensure_initialized.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DEPS b/DEPS index c6c0ed39ff..8c621c46ec 100644 --- a/DEPS +++ b/DEPS @@ -6,7 +6,7 @@ vars = { 'extra_gyp_flag': '-Dextra_gyp_flag=0', 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': '915e47250fd4e9fec1b395a992fa43281ba02c85', + 'chromium_revision': 'e3860bd297e465778059f3d845280634b4074e19', } # NOTE: Use http rather than https; the latter can cause problems for users diff --git a/webrtc/api/test/androidtestinitializer.cc b/webrtc/api/test/androidtestinitializer.cc index 5fb86fe340..6791810d94 100644 --- a/webrtc/api/test/androidtestinitializer.cc +++ b/webrtc/api/test/androidtestinitializer.cc @@ -39,7 +39,7 @@ void EnsureInitializedOnce() { JNIEnv* jni = ::base::android::AttachCurrentThread(); JavaVM* jvm = NULL; RTC_CHECK_EQ(0, jni->GetJavaVM(&jvm)); - jobject context = ::base::android::GetApplicationContext(); + jobject context = ::base::android::GetApplicationContext().obj(); RTC_CHECK_GE(webrtc_jni::InitGlobalJniVariables(jvm), 0); RTC_CHECK(rtc::InitializeSSL()) << "Failed to InitializeSSL()"; diff --git a/webrtc/modules/audio_device/android/ensure_initialized.cc b/webrtc/modules/audio_device/android/ensure_initialized.cc index b63aec1f27..27a98d2952 100644 --- a/webrtc/modules/audio_device/android/ensure_initialized.cc +++ b/webrtc/modules/audio_device/android/ensure_initialized.cc @@ -31,7 +31,7 @@ void EnsureInitializedOnce() { JNIEnv* jni = ::base::android::AttachCurrentThread(); JavaVM* jvm = NULL; RTC_CHECK_EQ(0, jni->GetJavaVM(&jvm)); - jobject context = ::base::android::GetApplicationContext(); + jobject context = ::base::android::GetApplicationContext().obj(); // Initialize the Java environment (currently only used by the audio manager). webrtc::JVM::Initialize(jvm, context);