Unregister from GCM when the only GCM app is removed

chrome/browser/extensions/extension_gcm_app_handler_unittest.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 <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 130 matching lines @@
                  const gcm::GCMClient::IncomingMessage& message) override {}
 
   void OnMessagesDeleted(const std::string& app_id) override {}
 
   void OnSendError(
       const std::string& app_id,
       const gcm::GCMClient::SendErrorDetails& send_error_details) override {}
 
   void OnUnregisterCompleted(const std::string& app_id,
                              gcm::GCMClient::Result result) override {
+    ExtensionGCMAppHandler::OnUnregisterCompleted(app_id, result);
     unregistration_result_ = result;
     waiter_->SignalCompleted();
   }
 
   void RemoveAppHandler(const std::string& app_id) override {
     ExtensionGCMAppHandler::RemoveAppHandler(app_id);
     if (!GetGCMDriver()->app_handlers().size())
       app_handler_count_drop_to_zero_ = true;
   }
 
@@ skipping 234 matching lines @@
   waiter()->PumpUILoop();
   EXPECT_FALSE(HasAppHandlers(extension->id()));
 
   // App handler is added when extension is reloaded.
   EnableExtension(extension.get());
   waiter()->PumpUILoop();
   EXPECT_TRUE(HasAppHandlers(extension->id()));
 
   // App handler is removed when extension is uninstalled.
   UninstallExtension(extension.get());
-  waiter()->PumpUILoop();
+  waiter()->WaitUntilCompleted();
   EXPECT_FALSE(HasAppHandlers(extension->id()));
 }
 
 TEST_F(ExtensionGCMAppHandlerTest, UnregisterOnExtensionUninstall) {
   scoped_refptr<Extension> extension(CreateExtension());
   LoadExtension(extension.get());
 
   // Kick off registration.
   std::vector<std::string> sender_ids;
   sender_ids.push_back("sender1");
   Register(extension->id(), sender_ids);
   waiter()->WaitUntilCompleted();
   EXPECT_EQ(gcm::GCMClient::SUCCESS, registration_result());
 
-  // Add another app handler in order to prevent the GCM service from being
-  // stopped when the extension is uninstalled. This is needed because otherwise
-  // we are not able to receive the unregistration result.
-  GetGCMDriver()->AddAppHandler("Foo", gcm_app_handler());
-
   // Unregistration should be triggered when the extension is uninstalled.
   UninstallExtension(extension.get());
   waiter()->WaitUntilCompleted();
   EXPECT_EQ(gcm::GCMClient::SUCCESS,
             gcm_app_handler()->unregistration_result());
-
-  // Clean up.
-  GetGCMDriver()->RemoveAppHandler("Foo");
 }
 
 TEST_F(ExtensionGCMAppHandlerTest, UpdateExtensionWithGcmPermissionKept) {
   scoped_refptr<Extension> extension(CreateExtension());
 
   // App handler is added when the extension is loaded.
   LoadExtension(extension.get());
   waiter()->PumpUILoop();
   EXPECT_TRUE(HasAppHandlers(extension->id()));
 
@@ skipping 14 matching lines @@
 
   // App handler is removed when the extension is updated to the version that
   // has GCM permission removed.
   UpdateExtension(extension.get(), "good2.crx");
   waiter()->PumpUILoop();
   EXPECT_TRUE(gcm_app_handler()->app_handler_count_drop_to_zero());
   EXPECT_FALSE(HasAppHandlers(extension->id()));
 }
 
 }  // namespace extensions