Push API: Fix registration failing because app handler is missing

chrome/browser/services/gcm/push_messaging_service_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_SERVICES_GCM_PUSH_MESSAGING_SERVICE_IMPL_H_
 #define CHROME_BROWSER_SERVICES_GCM_PUSH_MESSAGING_SERVICE_IMPL_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "components/gcm_driver/gcm_app_handler.h"
@@ skipping 57 matching lines @@
       const GURL& requesting_origin,
       int64 service_worker_registration_id,
       const content::PushMessagingService::UnregisterCallback&) override;
   blink::WebPushPermissionStatus GetPermissionStatus(
       const GURL& requesting_origin,
       const GURL& embedding_origin) override;
 
   void SetProfileForTesting(Profile* profile);
 
  private:
-  void IncreasePushRegistrationCount(int add);
-  void DecreasePushRegistrationCount(int subtract);
+  // A registration is pending until it has succeeded or failed.
+  void IncreasePushRegistrationCount(int add, bool is_pending);
+  void DecreasePushRegistrationCount(int subtract, bool was_pending);
 
   void DeliverMessageCallback(const PushMessagingApplicationId& application_id,
                               const GCMClient::IncomingMessage& message,
                               content::PushDeliveryStatus status);
 
   // Developers are required to display a Web Notification in response to an
   // incoming push message in order to clarify to the user that something has
   // happened in the background. When they forget to do so, display a default
   // notification on their behalf.
   void RequireUserVisibleUX(const PushMessagingApplicationId& application_id);
@@ skipping 23 matching lines @@
 
   void Unregister(const PushMessagingApplicationId& application_id,
                   const content::PushMessagingService::UnregisterCallback&);
 
   void DidUnregister(const content::PushMessagingService::UnregisterCallback&,
                      GCMClient::Result result);
 
   // Helper method that checks if a given origin is allowed to use Push.
   bool HasPermission(const GURL& origin);
 
-  // Adds this service as an app handler to the GCMDriver if it has not been
-  // added yet.
-  void AddAppHandlerIfNecessary();
-
   GCMProfileService* gcm_profile_service_;  // It owns us.
 
   Profile* profile_;  // It owns our owner.
 
   int push_registration_count_;
+  int pending_push_registration_count_;
 
   base::WeakPtrFactory<PushMessagingServiceImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PushMessagingServiceImpl);
 };
 
 }  // namespace gcm
 
 #endif  // CHROME_BROWSER_SERVICES_GCM_PUSH_MESSAGING_SERVICE_IMPL_H_