diff options
author | torne <torne@chromium.org> | 2015-12-11 11:14:34 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-12-11 19:15:54 +0000 |
commit | c56e1bf254f13ae7434435ade4cc074100d8e726 (patch) | |
tree | cab43a1b3f41875fa13418c09b7583b6677fb32d /components/invalidation | |
parent | 6d45dcc988e2c1ca0e93e03bf304c26d82e86b4c (diff) | |
download | chromium_src-c56e1bf254f13ae7434435ade4cc074100d8e726.zip chromium_src-c56e1bf254f13ae7434435ade4cc074100d8e726.tar.gz chromium_src-c56e1bf254f13ae7434435ade4cc074100d8e726.tar.bz2 |
Pass method parameters as JavaParamRef in components.
Pass all object parameters to JNI methods in JavaParamRef<> wrappers.
This matches previous changes made to do this for JNI non-method
functions.
This omits changes to components/policy as it's not quite as trivial,
will handle separately.
BUG=506850
Review URL: https://codereview.chromium.org/1522443002
Cr-Commit-Position: refs/heads/master@{#364768}
Diffstat (limited to 'components/invalidation')
-rw-r--r-- | components/invalidation/impl/invalidation_service_android.cc | 13 | ||||
-rw-r--r-- | components/invalidation/impl/invalidation_service_android.h | 6 |
2 files changed, 10 insertions, 9 deletions
diff --git a/components/invalidation/impl/invalidation_service_android.cc b/components/invalidation/impl/invalidation_service_android.cc index 06e24f5..cb7d845 100644 --- a/components/invalidation/impl/invalidation_service_android.cc +++ b/components/invalidation/impl/invalidation_service_android.cc @@ -119,12 +119,13 @@ void InvalidationServiceAndroid::TriggerStateChangeForTest( invalidator_registrar_.UpdateInvalidatorState(invalidator_state_); } -void InvalidationServiceAndroid::Invalidate(JNIEnv* env, - jobject obj, - jint object_source, - jstring java_object_id, - jlong version, - jstring java_payload) { +void InvalidationServiceAndroid::Invalidate( + JNIEnv* env, + const JavaParamRef<jobject>& obj, + jint object_source, + const JavaParamRef<jstring>& java_object_id, + jlong version, + const JavaParamRef<jstring>& java_payload) { syncer::ObjectIdInvalidationMap object_invalidation_map; if (!java_object_id) { syncer::ObjectIdSet sync_ids; diff --git a/components/invalidation/impl/invalidation_service_android.h b/components/invalidation/impl/invalidation_service_android.h index bd135fc..c8c2a3df 100644 --- a/components/invalidation/impl/invalidation_service_android.h +++ b/components/invalidation/impl/invalidation_service_android.h @@ -51,11 +51,11 @@ class InvalidationServiceAndroid IdentityProvider* GetIdentityProvider() override; void Invalidate(JNIEnv* env, - jobject obj, + const base::android::JavaParamRef<jobject>& obj, jint object_source, - jstring object_id, + const base::android::JavaParamRef<jstring>& object_id, jlong version, - jstring state); + const base::android::JavaParamRef<jstring>& state); // The InvalidationServiceAndroid always reports that it is enabled. // This is used only by unit tests. |