Remove ShowDesktopNotificationHostMsgParams in favor of PlatformNotificationData.

content/renderer/service_worker/service_worker_script_context.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/service_worker/service_worker_script_context.h"
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
+#include "content/child/notifications/notification_data_conversions.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/child/webmessageportchannel_impl.h"
 #include "content/common/service_worker/service_worker_messages.h"
 #include "content/renderer/service_worker/embedded_worker_context_client.h"
 #include "ipc/ipc_message.h"
 #include "third_party/WebKit/public/platform/WebNotificationData.h"
 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerRequest.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
@@ skipping 240 matching lines @@
 
 void ServiceWorkerScriptContext::OnSyncEvent(int request_id) {
   TRACE_EVENT0("ServiceWorker",
                "ServiceWorkerScriptContext::OnSyncEvent");
   proxy_->dispatchSyncEvent(request_id);
 }
 
 void ServiceWorkerScriptContext::OnNotificationClickEvent(
     int request_id,
     const std::string& notification_id,
-    const ShowDesktopNotificationHostMsgParams& notification_data) {
+    const PlatformNotificationData& notification_data) {
   TRACE_EVENT0("ServiceWorker",
                "ServiceWorkerScriptContext::OnNotificationClickEvent");
   notification_click_start_timings_[request_id] = base::TimeTicks::Now();
-
-  // TODO(peter): Set the appropriate direction once it's been plumbed through.
-  // TODO(peter): Store the notification's language and icon URL in the struct.
-  blink::WebNotificationData notification(
-      blink::WebString(notification_data.title),
-      blink::WebNotificationData::DirectionLeftToRight,
-      blink::WebString() /* lang */,
-      blink::WebString(notification_data.body),
-      blink::WebString(notification_data.replace_id),
-      blink::WebURL() /* icon_url */);
-
   proxy_->dispatchNotificationClickEvent(
       request_id,
       blink::WebString::fromUTF8(notification_id),
-      notification);
+      ToWebNotificationData(notification_data));
 }
 
 void ServiceWorkerScriptContext::OnPushEvent(int request_id,
                                              const std::string& data) {
   TRACE_EVENT0("ServiceWorker",
                "ServiceWorkerScriptContext::OnPushEvent");
   push_start_timings_[request_id] = base::TimeTicks::Now();
   proxy_->dispatchPushEvent(request_id, blink::WebString::fromUTF8(data));
 }
 
@@ skipping 84 matching lines @@
       pending_skip_waiting_callbacks_.Lookup(request_id);
   if (!callbacks) {
     NOTREACHED() << "Got stray response: " << request_id;
     return;
   }
   callbacks->onSuccess();
   pending_skip_waiting_callbacks_.Remove(request_id);
 }
 
 }  // namespace content