| Index: blimp/client/app/android/blimp_client_session_android.cc
|
| diff --git a/blimp/client/app/android/blimp_client_session_android.cc b/blimp/client/app/android/blimp_client_session_android.cc
|
| index d1bfafce52175dc2f95e51d33139d6a9b5277b64..2a269ee6d14014d4ff89c593008dbfdebc3e7852 100644
|
| --- a/blimp/client/app/android/blimp_client_session_android.cc
|
| +++ b/blimp/client/app/android/blimp_client_session_android.cc
|
| @@ -87,14 +87,14 @@ BlimpClientSessionAndroid::~BlimpClientSessionAndroid() {}
|
|
|
| void BlimpClientSessionAndroid::OnConnected() {
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| - Java_BlimpClientSession_onConnected(env, java_obj_.obj());
|
| + Java_BlimpClientSession_onConnected(env, java_obj_);
|
| }
|
|
|
| void BlimpClientSessionAndroid::OnDisconnected(int result) {
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| Java_BlimpClientSession_onDisconnected(
|
| - env, java_obj_.obj(), base::android::ConvertUTF8ToJavaString(
|
| - env, net::ErrorToShortString(result)).obj());
|
| + env, java_obj_, base::android::ConvertUTF8ToJavaString(
|
| + env, net::ErrorToShortString(result)));
|
| }
|
|
|
| void BlimpClientSessionAndroid::Destroy(JNIEnv* env,
|
| @@ -110,11 +110,10 @@ void BlimpClientSessionAndroid::OnAssignmentConnectionAttempted(
|
| assignment.engine_endpoint.address(), assignment.engine_endpoint.port());
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| Java_BlimpClientSession_onAssignmentReceived(
|
| - env, java_obj_.obj(), static_cast<jint>(result),
|
| - base::android::ConvertUTF8ToJavaString(env, engine_ip).obj(),
|
| + env, java_obj_, static_cast<jint>(result),
|
| + base::android::ConvertUTF8ToJavaString(env, engine_ip),
|
| base::android::ConvertUTF8ToJavaString(env,
|
| - version_info::GetVersionNumber())
|
| - .obj());
|
| + version_info::GetVersionNumber()));
|
|
|
| BlimpClientSession::OnAssignmentConnectionAttempted(result, assignment);
|
| }
|
|
|