Push API: Fix unsubscribing from GCM on Android

chrome/browser/extensions/extension_gcm_app_handler.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 "chrome/browser/extensions/extension_gcm_app_handler.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/location.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 117 matching lines @@
   // should not remove the app handler in this case and it will be handled
   // in OnExtensionUninstalled.
   if (reason != UnloadedExtensionInfo::REASON_UNINSTALL)
     RemoveAppHandler(extension->id());
 }
 
 void ExtensionGCMAppHandler::OnExtensionUninstalled(
     content::BrowserContext* browser_context,
     const Extension* extension,
     extensions::UninstallReason reason) {
+#if defined(OS_ANDROID)
+#error If this ever gets ported to Android, you must pass the real sender ID.

[jianli, 2015/02/13 22:33:16]

ditto.

[johnme, 2015/02/14 01:48:35]

The patch no longer modifies this file.

+#endif
   if (IsGCMPermissionEnabled(extension)) {
+    std::vector<std::string> sender_ids;  // These are ignored on non-Android.
     GetGCMDriver()->Unregister(
         extension->id(),
+        sender_ids,
         base::Bind(&ExtensionGCMAppHandler::OnUnregisterCompleted,
                    weak_factory_.GetWeakPtr(),
                    extension->id()));
   }
 }
 
 void ExtensionGCMAppHandler::AddDummyAppHandler() {
   AddAppHandler(kDummyAppId);
 }
 
@@ skipping 12 matching lines @@
 
 void ExtensionGCMAppHandler::AddAppHandler(const std::string& app_id) {
   GetGCMDriver()->AddAppHandler(app_id, this);
 }
 
 void ExtensionGCMAppHandler::RemoveAppHandler(const std::string& app_id) {
   GetGCMDriver()->RemoveAppHandler(app_id);
 }
 
 }  // namespace extensions