Remove ShowDesktopNotificationHostMsgParams in favor of PlatformNotificationData.

chrome/browser/notifications/platform_notification_service_impl.cc

Index: chrome/browser/notifications/platform_notification_service_impl.cc
diff --git a/chrome/browser/notifications/platform_notification_service_impl.cc b/chrome/browser/notifications/platform_notification_service_impl.cc
index 89e483a1506eccdebd57794a36fd7d064b36d036..21820453f11d2e01084f0f221f5dd0402024c6dd 100644
--- a/chrome/browser/notifications/platform_notification_service_impl.cc
+++ b/chrome/browser/notifications/platform_notification_service_impl.cc
@@ -12,7 +12,6 @@
 #include "components/content_settings/core/common/content_settings.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"
 
 #if defined(ENABLE_EXTENSIONS)
 #include "extensions/browser/info_map.h"
@@ -77,7 +76,9 @@ PlatformNotificationServiceImpl::CheckPermission(
 
 void PlatformNotificationServiceImpl::DisplayNotification(
     content::BrowserContext* browser_context,
-    const content::ShowDesktopNotificationHostMsgParams& params,
+    const GURL& origin,
+    const SkBitmap& icon,
+    const content::PlatformNotificationData& notification_data,
     scoped_ptr<content::DesktopNotificationDelegate> delegate,
     int render_process_id,
     base::Closure* cancel_callback) {
@@ -90,16 +91,18 @@ void PlatformNotificationServiceImpl::DisplayNotification(
       DesktopNotificationServiceFactory::GetForProfile(profile);
   DCHECK(service);
 
-  service->ShowDesktopNotification(
-      params, render_process_id, delegate.Pass(), cancel_callback);
+  service->ShowDesktopNotification(origin, icon, notification_data,
+      render_process_id, delegate.Pass(), cancel_callback);
   profile->GetHostContentSettingsMap()->UpdateLastUsage(
-      params.origin, params.origin, CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
+      origin, origin, CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
 }
 
 void PlatformNotificationServiceImpl::DisplayPersistentNotification(
     content::BrowserContext* browser_context,
     int64 service_worker_registration_id,
-    const content::ShowDesktopNotificationHostMsgParams& params,
+    const GURL& origin,
+    const SkBitmap& icon,
+    const content::PlatformNotificationData& notification_data,
     int render_process_id) {
   NOTIMPLEMENTED();
 }