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..518a4ac7a1e9d40e65217e6a37588320662ea3b4 100644
--- a/components/gcm_driver/gcm_driver_android.cc
+++ b/components/gcm_driver/gcm_driver_android.cc
@@ -169,20 +169,27 @@ 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) {
+  DCHECK_EQ(1u, sender_ids.size());
   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) {
+  NOTREACHED();
+}
+
+void GCMDriverAndroid::UnregisterWithSenderIdImpl(const std::string& app_id,
+                                                  const std::string& sender_id)
+{

[Peter Beverloo, 2015/02/17 21:51:05]

nit: I guess we have to indent this "{" by four spaces.

[johnme, 2015/02/17 22:05:10]

Eww, no. I've wrapped the arguments to avoid this :)

   JNIEnv* env = AttachCurrentThread();
   Java_GCMDriver_unregister(
       env, java_ref_.obj(),
-      ConvertUTF8ToJavaString(env, app_id).Release());
+      ConvertUTF8ToJavaString(env, app_id).Release(),
+      ConvertUTF8ToJavaString(env, sender_id).Release());
 }
 
 void GCMDriverAndroid::SendImpl(const std::string& app_id,