| Index: content/browser/mojo/service_registry_android.cc
|
| diff --git a/content/browser/mojo/service_registry_android.cc b/content/browser/mojo/service_registry_android.cc
|
| index d2187a3a3de49cd7c423a81700c2b101fdbbe582..7978cff7ae4bdc1e2f392e22ef3d722c654d572c 100644
|
| --- a/content/browser/mojo/service_registry_android.cc
|
| +++ b/content/browser/mojo/service_registry_android.cc
|
| @@ -57,11 +57,12 @@ ServiceRegistryAndroid::~ServiceRegistryAndroid() {
|
| }
|
|
|
| // Methods called from Java.
|
| -void ServiceRegistryAndroid::AddService(JNIEnv* env,
|
| - jobject j_service_registry,
|
| - jobject j_manager,
|
| - jobject j_factory,
|
| - jstring j_name) {
|
| +void ServiceRegistryAndroid::AddService(
|
| + JNIEnv* env,
|
| + const JavaParamRef<jobject>& j_service_registry,
|
| + const JavaParamRef<jobject>& j_manager,
|
| + const JavaParamRef<jobject>& j_factory,
|
| + const JavaParamRef<jstring>& j_name) {
|
| std::string name(ConvertJavaStringToUTF8(env, j_name));
|
|
|
| ScopedJavaGlobalRef<jobject> j_scoped_service_registry;
|
| @@ -79,17 +80,19 @@ void ServiceRegistryAndroid::AddService(JNIEnv* env,
|
| j_scoped_manager, j_scoped_factory));
|
| }
|
|
|
| -void ServiceRegistryAndroid::RemoveService(JNIEnv* env,
|
| - jobject j_service_registry,
|
| - jstring j_name) {
|
| +void ServiceRegistryAndroid::RemoveService(
|
| + JNIEnv* env,
|
| + const JavaParamRef<jobject>& j_service_registry,
|
| + const JavaParamRef<jstring>& j_name) {
|
| std::string name(ConvertJavaStringToUTF8(env, j_name));
|
| service_registry_->Remove(name);
|
| }
|
|
|
| -void ServiceRegistryAndroid::ConnectToRemoteService(JNIEnv* env,
|
| - jobject j_service_registry,
|
| - jstring j_name,
|
| - jint j_handle) {
|
| +void ServiceRegistryAndroid::ConnectToRemoteService(
|
| + JNIEnv* env,
|
| + const JavaParamRef<jobject>& j_service_registry,
|
| + const JavaParamRef<jstring>& j_name,
|
| + jint j_handle) {
|
| std::string name(ConvertJavaStringToUTF8(env, j_name));
|
| mojo::ScopedMessagePipeHandle handle((mojo::MessagePipeHandle(j_handle)));
|
| service_registry_->Connect(name, std::move(handle));
|
|
|