Define PushMessagingApplicationId and replace ad-hoc code.

chrome/browser/services/gcm/push_messaging_service_impl.h

Index: chrome/browser/services/gcm/push_messaging_service_impl.h
diff --git a/chrome/browser/services/gcm/push_messaging_service_impl.h b/chrome/browser/services/gcm/push_messaging_service_impl.h
index eceb81df2ddd9c41265cd1ac4d9434e9617bfb7d..5a8c1c296e750cb5e501a134d80cb7a8db5c67fa 100644
--- a/chrome/browser/services/gcm/push_messaging_service_impl.h
+++ b/chrome/browser/services/gcm/push_messaging_service_impl.h
@@ -21,6 +21,7 @@ class PrefRegistrySyncable;
 namespace gcm {
 
 class GCMProfileService;
+struct PushMessagingApplicationId;
 
 class PushMessagingServiceImpl : public content::PushMessagingService,
                                  public GCMAppHandler {
@@ -47,7 +48,8 @@ class PushMessagingServiceImpl : public content::PushMessagingService,
 
   // content::PushMessagingService implementation:
   virtual void Register(
-      const std::string& app_id,
+      const GURL& origin,
+      int64 service_worker_registration_id,
       const std::string& sender_id,
       int renderer_id,
       int render_frame_id,
@@ -56,20 +58,18 @@ class PushMessagingServiceImpl : public content::PushMessagingService,
 
  private:
   void RegisterEnd(
-      const std::string& app_id,
       const content::PushMessagingService::RegisterCallback& callback,
       const std::string& registration_id,
       content::PushMessagingStatus status);
 
   void DidRegister(
-      const std::string& app_id,
       const content::PushMessagingService::RegisterCallback& callback,
       const std::string& registration_id,
       GCMClient::Result result);
 
   void DidRequestPermission(
+      const PushMessagingApplicationId& application_id,
       const std::string& sender_id,
-      const std::string& app_id,
       const content::PushMessagingService::RegisterCallback& callback,
       bool allow);