Make //content responsible for generating notification Ids

content/common/platform_notification_messages.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.
 
 // Messages for platform-native notifications using the Web Notification API.
 // Multiply-included message file, hence no include guard.
 
 #include <stdint.h>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "content/public/common/common_param_traits_macros.h"
 #include "content/public/common/notification_resources.h"
 #include "content/public/common/platform_notification_data.h"
 #include "ipc/ipc_message_macros.h"
 
 // Singly-included section for type definitions.
 #ifndef CONTENT_COMMON_PLATFORM_NOTIFICATION_MESSAGES_H_
 #define CONTENT_COMMON_PLATFORM_NOTIFICATION_MESSAGES_H_
 
-// Defines the pair of [persistent notification id] => [notification data] used
-// when getting the notifications for a given Service Worker registration.
+// Defines the pair of [notification id] => [notification data] used when
+// getting the notifications for a given Service Worker registration.
 using PersistentNotificationInfo =
-    std::pair<int64_t, content::PlatformNotificationData>;
+    std::pair<std::string, content::PlatformNotificationData>;
 
 #endif  // CONTENT_COMMON_PLATFORM_NOTIFICATION_MESSAGES_H_
 
 #define IPC_MESSAGE_START PlatformNotificationMsgStart
 
 IPC_ENUM_TRAITS_MAX_VALUE(
     content::PlatformNotificationData::Direction,
     content::PlatformNotificationData::DIRECTION_LAST)
 
 IPC_ENUM_TRAITS_MAX_VALUE(content::PlatformNotificationActionType,
@@ skipping 57 matching lines @@
 // available notifications per the request's constraints.
 IPC_MESSAGE_CONTROL2(PlatformNotificationMsg_DidGetNotifications,
                      int /* request_id */,
                      std::vector<PersistentNotificationInfo>
                          /* notifications */)
 
 // Messages sent from the renderer to the browser.
 
 IPC_MESSAGE_CONTROL4(
     PlatformNotificationHostMsg_Show,
-    int /* notification_id */,
+    int /* non_persistent_notification_id */,
     GURL /* origin */,
     content::PlatformNotificationData /* notification_data */,
     content::NotificationResources /* notification_resources */)
 
 IPC_MESSAGE_CONTROL5(
     PlatformNotificationHostMsg_ShowPersistent,
     int /* request_id */,
     int64_t /* service_worker_registration_id */,
     GURL /* origin */,
     content::PlatformNotificationData /* notification_data */,
     content::NotificationResources /* notification_resources */)
 
 IPC_MESSAGE_CONTROL4(PlatformNotificationHostMsg_GetNotifications,
                      int /* request_id */,
                      int64_t /* service_worker_registration_id */,
                      GURL /* origin */,
                      std::string /* filter_tag */)
 
-IPC_MESSAGE_CONTROL1(PlatformNotificationHostMsg_Close,
-                     int /* notification_id */)
+IPC_MESSAGE_CONTROL3(PlatformNotificationHostMsg_Close,
+                     GURL /* origin */,
+                     std::string /* tag */,
+                     int /* non_persistent_notification_id */)
 
-IPC_MESSAGE_CONTROL2(PlatformNotificationHostMsg_ClosePersistent,
+IPC_MESSAGE_CONTROL3(PlatformNotificationHostMsg_ClosePersistent,
                      GURL /* origin */,
-                     int64_t /* persistent_notification_id */)
+                     std::string /* tag */,
+                     std::string /* notification_id */)