| Index: sky/shell/java_service_provider.cc
|
| diff --git a/sky/shell/java_service_provider.cc b/sky/shell/java_service_provider.cc
|
| index 4856a1b4985f1afe9db07674bcab4b5919cdcd6a..be2c2fbf09279f0b28503dff876e102a34d11647 100644
|
| --- a/sky/shell/java_service_provider.cc
|
| +++ b/sky/shell/java_service_provider.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "base/android/jni_android.h"
|
| #include "jni/JavaServiceProvider_jni.h"
|
| +#include "mojo/public/cpp/bindings/interface_request.h"
|
|
|
| namespace sky {
|
| namespace shell {
|
| @@ -14,11 +15,12 @@ bool RegisterJavaServiceProvider(JNIEnv* env) {
|
| return RegisterNativesImpl(env);
|
| }
|
|
|
| -mojo::ScopedMessagePipeHandle CreateJavaServiceProvider() {
|
| - JNIEnv* env = base::android::AttachCurrentThread();
|
| - return mojo::ScopedMessagePipeHandle(
|
| - mojo::MessagePipeHandle(Java_JavaServiceProvider_create(
|
| - env, base::android::GetApplicationContext())));
|
| +void CreateJavaServiceProvider(
|
| + mojo::InterfaceRequest<mojo::ServiceProvider> request) {
|
| + Java_JavaServiceProvider_create(
|
| + base::android::AttachCurrentThread(),
|
| + base::android::GetApplicationContext(),
|
| + request.PassMessagePipe().release().value());
|
| }
|
|
|
| } // namespace shell
|
|
|