Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2115)

Unified Diff: android/jni_generator/sample_for_tests.cc

Issue 2045303002: Update to Chromium //base at Chromium commit 3e81715e6d3a4324362635aea46ce1f1a163cca1. (Closed) Base URL: https://chromium.googlesource.com/external/github.com/domokit/base@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « android/jni_generator/jni_generator_tests.py ('k') | android/jni_generator/testCalledByNatives.golden » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android/jni_generator/sample_for_tests.cc
diff --git a/android/jni_generator/sample_for_tests.cc b/android/jni_generator/sample_for_tests.cc
index 8ba77c61ff669cb8fbcb7037251e16a5eb12fb98..c5820ab6266a308c0b9e4d1462a3ce4c2e8b2418 100644
--- a/android/jni_generator/sample_for_tests.cc
+++ b/android/jni_generator/sample_for_tests.cc
@@ -82,8 +82,8 @@ static jfloat GetFloatFunction(JNIEnv*, jclass) {
static void SetNonPODDatatype(JNIEnv*, jobject, jobject) {
}
-static jobject GetNonPODDatatype(JNIEnv*, jobject) {
- return NULL;
+static ScopedJavaLocalRef<jobject> GetNonPODDatatype(JNIEnv*, jobject) {
+ return ScopedJavaLocalRef<jobject>();
}
static jint InnerFunction(JNIEnv*, jclass) {
« no previous file with comments | « android/jni_generator/jni_generator_tests.py ('k') | android/jni_generator/testCalledByNatives.golden » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698