Merge the code paths for closing different kinds of notifications.

content/common/platform_notification_messages.h

Index: content/common/platform_notification_messages.h
diff --git a/content/common/platform_notification_messages.h b/content/common/platform_notification_messages.h
index 02bb9f3af973da03cc726ee9bb139ced31e5efd8..7646c0ea9ac4f219c76abb2fc2b434f9e8d75401 100644
--- a/content/common/platform_notification_messages.h
+++ b/content/common/platform_notification_messages.h
@@ -71,16 +71,18 @@ 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
@@ -122,9 +124,4 @@ IPC_MESSAGE_CONTROL4(PlatformNotificationHostMsg_GetNotifications,
 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 */)