Remove ShowDesktopNotificationHostMsgParams in favor of PlatformNotificationData.

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 51c94e7ec9e1ba6ff22b3999c52d7276e9302337..4480fed17bd589cb1d65a316a3f0ed6afaec6325 100644
--- a/content/common/platform_notification_messages.h
+++ b/content/common/platform_notification_messages.h
@@ -5,22 +5,27 @@
 // Messages for platform-native notifications using the Web Notification API.
 // Multiply-included message file, hence no include guard.
 
-#include "content/public/common/show_desktop_notification_params.h"
+#include "content/public/common/platform_notification_data.h"
 #include "ipc/ipc_message_macros.h"
 #include "third_party/WebKit/public/platform/WebNotificationPermission.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 
 #define IPC_MESSAGE_START PlatformNotificationMsgStart
 
 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebNotificationPermission,
                           blink::WebNotificationPermissionLast)
 
-IPC_STRUCT_TRAITS_BEGIN(content::ShowDesktopNotificationHostMsgParams)
-  IPC_STRUCT_TRAITS_MEMBER(origin)
-  IPC_STRUCT_TRAITS_MEMBER(icon)
+IPC_ENUM_TRAITS_MAX_VALUE(
+    content::PlatformNotificationData::NotificationDirection,
+    content::PlatformNotificationData::NotificationDirectionRightToLeft)
+
+IPC_STRUCT_TRAITS_BEGIN(content::PlatformNotificationData)
   IPC_STRUCT_TRAITS_MEMBER(title)
-  IPC_STRUCT_TRAITS_MEMBER(body)
   IPC_STRUCT_TRAITS_MEMBER(direction)
-  IPC_STRUCT_TRAITS_MEMBER(replace_id)
+  IPC_STRUCT_TRAITS_MEMBER(lang)
+  IPC_STRUCT_TRAITS_MEMBER(body)
+  IPC_STRUCT_TRAITS_MEMBER(tag)
+  IPC_STRUCT_TRAITS_MEMBER(icon)
 IPC_STRUCT_TRAITS_END()
 
 // Messages sent from the browser to the renderer.
@@ -44,14 +49,18 @@ IPC_MESSAGE_CONTROL1(PlatformNotificationMsg_DidClick,
 
 // Messages sent from the renderer to the browser.
 
-IPC_MESSAGE_CONTROL2(PlatformNotificationHostMsg_Show,
+IPC_MESSAGE_CONTROL4(PlatformNotificationHostMsg_Show,
                      int /* notification_id */,
-                     content::ShowDesktopNotificationHostMsgParams /* params */)
+                     GURL /* origin */,
+                     SkBitmap /* icon */,
+                     content::PlatformNotificationData /* notification_data */)
 
-IPC_MESSAGE_CONTROL3(PlatformNotificationHostMsg_ShowPersistent,
+IPC_MESSAGE_CONTROL5(PlatformNotificationHostMsg_ShowPersistent,
                      int /* request_id */,
                      int64 /* service_worker_provider_id */,
-                     content::ShowDesktopNotificationHostMsgParams /* params */)
+                     GURL /* origin */,
+                     SkBitmap /* icon */,
+                     content::PlatformNotificationData /* notification_data */)
 
 IPC_MESSAGE_CONTROL1(PlatformNotificationHostMsg_Close,
                      int /* notification_id */)