Merge the code paths for closing different kinds of notifications.

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>
@@ skipping 53 matching lines @@
 IPC_STRUCT_TRAITS_BEGIN(content::NotificationResources)
   IPC_STRUCT_TRAITS_MEMBER(image)
   IPC_STRUCT_TRAITS_MEMBER(notification_icon)
   IPC_STRUCT_TRAITS_MEMBER(badge)
   IPC_STRUCT_TRAITS_MEMBER(action_icons)
 IPC_STRUCT_TRAITS_END()
 
 // Messages sent from the browser to the renderer.
 
 // Informs the renderer that the browser has displayed the notification.
-IPC_MESSAGE_CONTROL1(PlatformNotificationMsg_DidShow,
-                     int /* notification_id */)
+IPC_MESSAGE_CONTROL2(PlatformNotificationMsg_DidShow,
+                     int /* non_persistent_notification_id */,
+                     std::string /* notification_id */)
 
 // Informs the renderer that the notification has been closed.
-IPC_MESSAGE_CONTROL1(PlatformNotificationMsg_DidClose,
-                     int /* notification_id */)
+IPC_MESSAGE_CONTROL2(PlatformNotificationMsg_DidClose,
+                     int /* non_persistent_notification_id */,
+                     std::string /* notification_id */)
 
 // Informs the renderer that the notification has been clicked on.
 IPC_MESSAGE_CONTROL1(PlatformNotificationMsg_DidClick,
-                     int /* notification_id */)
+                     int /* non_persistent_notification_id */)
 
 // Reply to PlatformNotificationHostMsg_ShowPersistent indicating that a
 // persistent notification has been shown on the platform (if |success| is
 // true), or that an unspecified error occurred.
 IPC_MESSAGE_CONTROL2(PlatformNotificationMsg_DidShowPersistent,
                      int /* request_id */,
                      bool /* success */)
 
 // Reply to PlatformNotificationHostMsg_GetNotifications sharing a vector of
 // available notifications per the request's constraints.
@@ skipping 21 matching lines @@
 
 IPC_MESSAGE_CONTROL4(PlatformNotificationHostMsg_GetNotifications,
                      int /* request_id */,
                      int64_t /* service_worker_registration_id */,
                      GURL /* origin */,
                      std::string /* filter_tag */)
 
 IPC_MESSAGE_CONTROL3(PlatformNotificationHostMsg_Close,
                      GURL /* origin */,
                      std::string /* tag */,
-                     int /* non_persistent_notification_id */)
-
-IPC_MESSAGE_CONTROL3(PlatformNotificationHostMsg_ClosePersistent,
-                     GURL /* origin */,
-                     std::string /* tag */,
                      std::string /* notification_id */)