Unregister from GCM when the only GCM app is removed

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 106 matching lines @@
     // the update process since unloading and reloading extension are done in
     // the single function ExtensionService::AddExtension.
     AddDummyAppHandler();
 
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&ExtensionGCMAppHandler::RemoveDummyAppHandler,
                    weak_factory_.GetWeakPtr()));
   }
 
-  RemoveAppHandler(extension->id());
+  // When the extention is being uninstalled, it will be unloaded first. We
+  // 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 (IsGCMPermissionEnabled(extension)) {
     GetGCMDriver()->Unregister(
         extension->id(),
         base::Bind(&ExtensionGCMAppHandler::OnUnregisterCompleted,
                    weak_factory_.GetWeakPtr(),
                    extension->id()));
-    RemoveAppHandler(extension->id());
   }
 }
 
 void ExtensionGCMAppHandler::AddDummyAppHandler() {
   AddAppHandler(kDummyAppId);
 }
 
 void ExtensionGCMAppHandler::RemoveDummyAppHandler() {
   RemoveAppHandler(kDummyAppId);
 }
 
 gcm::GCMDriver* ExtensionGCMAppHandler::GetGCMDriver() const {
   return gcm::GCMProfileServiceFactory::GetForProfile(profile_)->driver();
 }
 
 void ExtensionGCMAppHandler::OnUnregisterCompleted(
     const std::string& app_id, gcm::GCMClient::Result result) {
-  // Nothing to do.
+  RemoveAppHandler(app_id);
 }
 
 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