| Index: components/gcm_driver/gcm_driver_android.cc
|
| diff --git a/components/gcm_driver/gcm_driver_android.cc b/components/gcm_driver/gcm_driver_android.cc
|
| index 3354c227219b5b37b8bfafb2babf71ffa81d124b..325f83fb1528bcd2200ad6e4544c467c4e777ed9 100644
|
| --- a/components/gcm_driver/gcm_driver_android.cc
|
| +++ b/components/gcm_driver/gcm_driver_android.cc
|
| @@ -38,7 +38,7 @@ namespace gcm {
|
|
|
| GCMDriverAndroid::~GCMDriverAndroid() {
|
| JNIEnv* env = AttachCurrentThread();
|
| - Java_GCMDriver_destroy(env, java_ref_.obj());
|
| + Java_GCMDriver_destroy(env, java_ref_);
|
| }
|
|
|
| void GCMDriverAndroid::OnRegisterFinished(
|
| @@ -233,9 +233,8 @@ void GCMDriverAndroid::RegisterImpl(
|
|
|
| recorder_.RecordRegistrationSent(app_id);
|
|
|
| - Java_GCMDriver_register(env, java_ref_.obj(),
|
| - ConvertUTF8ToJavaString(env, app_id).obj(),
|
| - ConvertUTF8ToJavaString(env, sender_ids[0]).obj());
|
| + Java_GCMDriver_register(env, java_ref_, ConvertUTF8ToJavaString(env, app_id),
|
| + ConvertUTF8ToJavaString(env, sender_ids[0]));
|
| }
|
|
|
| void GCMDriverAndroid::UnregisterImpl(const std::string& app_id) {
|
| @@ -249,9 +248,9 @@ void GCMDriverAndroid::UnregisterWithSenderIdImpl(
|
|
|
| recorder_.RecordUnregistrationSent(app_id);
|
|
|
| - Java_GCMDriver_unregister(env, java_ref_.obj(),
|
| - ConvertUTF8ToJavaString(env, app_id).obj(),
|
| - ConvertUTF8ToJavaString(env, sender_id).obj());
|
| + Java_GCMDriver_unregister(env, java_ref_,
|
| + ConvertUTF8ToJavaString(env, app_id),
|
| + ConvertUTF8ToJavaString(env, sender_id));
|
| }
|
|
|
| void GCMDriverAndroid::SendImpl(const std::string& app_id,
|
|
|