Push API: Fix unsubscribing from GCM on Android

chrome/browser/extensions/extension_gcm_app_handler.cc

Index: chrome/browser/extensions/extension_gcm_app_handler.cc
diff --git a/chrome/browser/extensions/extension_gcm_app_handler.cc b/chrome/browser/extensions/extension_gcm_app_handler.cc
index 92cec5e6db5ecfd81d1ca91e911fe3d05bb662cb..258cfd97eaaeb27655f72b07bcdf1ee8fee08776 100644
--- a/chrome/browser/extensions/extension_gcm_app_handler.cc
+++ b/chrome/browser/extensions/extension_gcm_app_handler.cc
@@ -132,12 +132,18 @@ void ExtensionGCMAppHandler::OnExtensionUninstalled(
     const Extension* extension,
     extensions::UninstallReason reason) {
   if (IsGCMPermissionEnabled(extension)) {
+#if defined(OS_ANDROID)
+    LOG(FATAL) << "Unregistering from GCM requires a sender_id on Android";

[jianli, 2015/02/12 20:03:30]

ditto.

[johnme, 2015/02/13 19:11:56]

Done.

+#else
+    std::vector<std::string> sender_ids;  // These are ignored on desktop.
     GetGCMDriver()->Unregister(
         extension->id(),
+        sender_ids,
         base::Bind(&ExtensionGCMAppHandler::OnUnregisterCompleted,
                    weak_factory_.GetWeakPtr(),
                    extension->id()));
     RemoveAppHandler(extension->id());
+#endif
   }
 }