| commit | 235020dba690aef0fcf4c25a532fde48a27ae2d1 | [log] [tgz] |
|---|---|---|
| author | magjed <magjed@webrtc.org> | Thu Aug 18 01:45:45 2016 -0700 |
| committer | Commit bot <commit-bot@chromium.org> | Thu Aug 18 08:45:53 2016 +0000 |
| tree | 4427351a7e7a41beda0d9eb5f9c17e610bc44c35 | |
| parent | 010f092919a743fa2e6bacccd0032bb6d3c2c877 [diff] |
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}
diff --git a/webrtc/api/test/androidtestinitializer.cc b/webrtc/api/test/androidtestinitializer.cc index 5fb86fe..6791810 100644 --- a/webrtc/api/test/androidtestinitializer.cc +++ b/webrtc/api/test/androidtestinitializer.cc
@@ -39,7 +39,7 @@ 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()";