Push API: Fix unsubscribing from GCM on Android

components/gcm_driver/gcm_driver_android.cc

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 93b2f919ba32db7106a503b8fade0ae7c2cdcb6d..d8fa14b55559719497be254bdadf86cba66cf3f0 100644
--- a/components/gcm_driver/gcm_driver_android.cc
+++ b/components/gcm_driver/gcm_driver_android.cc
@@ -169,20 +169,23 @@ GCMClient::Result GCMDriverAndroid::EnsureStarted(
 }
 
 void GCMDriverAndroid::RegisterImpl(
-    const std::string& app_id,
-    const std::vector<std::string>& sender_ids) {
+    const std::string& app_id, const std::vector<std::string>& sender_ids) {
+  CHECK_EQ(1u, sender_ids.size());

[Peter Beverloo, 2015/02/17 18:49:36]

We use DCHECK_EQ unless it has security implications. Dito on line 183.

[johnme, 2015/02/17 21:24:07]

Done.

   JNIEnv* env = AttachCurrentThread();
   Java_GCMDriver_register(
       env, java_ref_.obj(),
       ConvertUTF8ToJavaString(env, app_id).Release(),
-      ToJavaArrayOfStrings(env, sender_ids).obj());
+      ConvertUTF8ToJavaString(env, sender_ids[0]).Release());
 }
 
-void GCMDriverAndroid::UnregisterImpl(const std::string& app_id) {
+void GCMDriverAndroid::UnregisterImpl(
+    const std::string& app_id, const std::string* maybe_sender_id) {
+  CHECK(maybe_sender_id);
   JNIEnv* env = AttachCurrentThread();
   Java_GCMDriver_unregister(
       env, java_ref_.obj(),
-      ConvertUTF8ToJavaString(env, app_id).Release());
+      ConvertUTF8ToJavaString(env, app_id).Release(),
+      ConvertUTF8ToJavaString(env, *maybe_sender_id).Release());
 }
 
 void GCMDriverAndroid::SendImpl(const std::string& app_id,