Remove ShowDesktopNotificationHostMsgParams in favor of PlatformNotificationData.

content/shell/browser/layout_test/layout_test_notification_manager.cc

Index: content/shell/browser/layout_test/layout_test_notification_manager.cc
diff --git a/content/shell/browser/layout_test/layout_test_notification_manager.cc b/content/shell/browser/layout_test/layout_test_notification_manager.cc
index ce4e86b931e07409d8d492b5fd59360dea87b09d..4cbaeabced3959ca75dad2cae9a48c5a166d097b 100644
--- a/content/shell/browser/layout_test/layout_test_notification_manager.cc
+++ b/content/shell/browser/layout_test/layout_test_notification_manager.cc
@@ -7,7 +7,7 @@
 #include "base/strings/utf_string_conversions.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"
 
 namespace content {
 
@@ -49,20 +49,22 @@ void LayoutTestNotificationManager::ClearPermissions() {
 
 void LayoutTestNotificationManager::DisplayNotification(
     BrowserContext* browser_context,
-    const ShowDesktopNotificationHostMsgParams& params,
+    const GURL& origin,
+    const SkBitmap& icon,
+    const PlatformNotificationData& notification_data,
     scoped_ptr<DesktopNotificationDelegate> delegate,
     int render_process_id,
     base::Closure* cancel_callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  std::string title = base::UTF16ToUTF8(params.title);
+  std::string title = base::UTF16ToUTF8(notification_data.title);
 
   DCHECK(cancel_callback);
   *cancel_callback = base::Bind(&LayoutTestNotificationManager::Close,
                                 weak_factory_.GetWeakPtr(),
                                 title);
 
-  if (params.replace_id.length()) {
-    std::string replace_id = base::UTF16ToUTF8(params.replace_id);
+  if (notification_data.tag.length()) {
+    std::string replace_id = base::UTF16ToUTF8(notification_data.tag);
     auto replace_iter = replacements_.find(replace_id);
     if (replace_iter != replacements_.end()) {
       const std::string& previous_title = replace_iter->second;
@@ -87,7 +89,9 @@ void LayoutTestNotificationManager::DisplayNotification(
 void LayoutTestNotificationManager::DisplayPersistentNotification(
     BrowserContext* browser_context,
     int64 service_worker_registration_id,
-    const ShowDesktopNotificationHostMsgParams& params,
+    const GURL& origin,
+    const SkBitmap& icon,
+    const PlatformNotificationData& platform_notification_data,
     int render_process_id) {
   // TODO(peter): Make persistent notifications layout testable.
   NOTIMPLEMENTED();