Roll chromium_revision 915e47250f..e3860bd297 (412201:412289)

Change log: 915e47250f..e3860bd297
Full diff: 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}
This commit is contained in:
magjed
2016-08-18 01:45:45 -07:00
committed by Commit bot
parent 010f092919
commit 235020dba6
3 changed files with 3 additions and 3 deletions

View File

@ -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()";