Remove ShowDesktopNotificationHostMsgParams in favor of PlatformNotificationData.

chrome/browser/notifications/desktop_notification_service.cc

Index: chrome/browser/notifications/desktop_notification_service.cc
diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc
index df4d5cbaa0721e46e6e2335507986fc7432b0844..31e42914045254a700e1f658976004df13b6b724 100644
--- a/chrome/browser/notifications/desktop_notification_service.cc
+++ b/chrome/browser/notifications/desktop_notification_service.cc
@@ -20,7 +20,8 @@
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/desktop_notification_delegate.h"
-#include "content/public/common/show_desktop_notification_params.h"
+#include "content/public/common/platform_notification_data.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/webui/web_ui_util.h"
 #include "ui/message_center/notifier_settings.h"
 
@@ -145,12 +146,13 @@ void DesktopNotificationService::RequestNotificationPermission(
 }
 
 void DesktopNotificationService::ShowDesktopNotification(
-    const content::ShowDesktopNotificationHostMsgParams& params,
+    const GURL& origin,
+    const SkBitmap& icon,
+    const content::PlatformNotificationData& notification_data,
     int render_process_id,
     scoped_ptr<content::DesktopNotificationDelegate> delegate,
     base::Closure* cancel_callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  const GURL& origin = params.origin;
   NotificationObjectProxy* proxy = new NotificationObjectProxy(delegate.Pass());
 
   base::string16 display_source = DisplayNameForOriginInProcessId(
@@ -160,9 +162,10 @@ void DesktopNotificationService::ShowDesktopNotification(
   // 1x scale, whereas the displays on which they can be displayed can have a
   // different pixel density. Be smarter about this when the API gets updated
   // with a way for developers to specify images of different resolutions.
-  Notification notification(origin, params.title, params.body,
-      gfx::Image::CreateFrom1xBitmap(params.icon),
-      display_source, params.replace_id, proxy);
+  Notification notification(origin, notification_data.title,
+      notification_data.body,
+      gfx::Image::CreateFrom1xBitmap(icon),
+      display_source, notification_data.tag, proxy);
 
   // The webkit notification doesn't timeout.
   notification.set_never_timeout(true);