Push API: Fix unsubscribing from GCM on Android

components/gcm_driver/gcm_driver_android.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/gcm_driver/gcm_driver_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/compiler_specific.h"
@@ skipping 151 matching lines @@
 void GCMDriverAndroid::WakeFromSuspendForHeartbeat(bool wake) {
 }
 
 GCMClient::Result GCMDriverAndroid::EnsureStarted(
     GCMClient::StartMode start_mode) {
   // TODO(johnme): Maybe we should check if GMS is available?
   return GCMClient::SUCCESS;
 }
 
 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(sender_ids.size() == 1);

[jianli, 2015/02/10 23:19:25]

Is web push messaging the only client for Android? Do we have other cases
multiple sender IDs could be used on Android?

nit: use CHECK_EQ

[johnme, 2015/02/12 19:15:25]

Push API is the only client I can find for GCMDriverAndroid. In any case, the
only GCMDriver client that uses multiple sender IDs is the chrome.gcm
Apps/Extensions API, so this should be fine.
Done (and below).

   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::vector<std::string>& sender_ids) {
+  CHECK(sender_ids.size() == 1);
   JNIEnv* env = AttachCurrentThread();
   Java_GCMDriver_unregister(
       env, java_ref_.obj(),
-      ConvertUTF8ToJavaString(env, app_id).Release());
+      ConvertUTF8ToJavaString(env, app_id).Release(),
+      ConvertUTF8ToJavaString(env, sender_ids[0]).Release());
 }
 
 void GCMDriverAndroid::SendImpl(const std::string& app_id,
                                 const std::string& receiver_id,
                                 const GCMClient::OutgoingMessage& message) {
   NOTIMPLEMENTED();
 }
 
 }  // namespace gcm