Use explicit WebString <-> string conversion methods for notifications

content/child/notifications/notification_manager.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/child/notifications/notification_manager.h"
 
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_local.h"
 #include "content/child/notifications/notification_data_conversions.h"
 #include "content/child/notifications/notification_dispatcher.h"
 #include "content/child/service_worker/web_service_worker_registration_impl.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/public/common/notification_resources.h"
 #include "content/public/common/platform_notification_data.h"
 #include "third_party/WebKit/public/platform/URLConversion.h"
 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
 #include "third_party/WebKit/public/platform/modules/notifications/WebNotificationDelegate.h"
 #include "url/origin.h"
 
+using blink::WebString;
+
 namespace content {
 namespace {
 
 int CurrentWorkerId() {
   return WorkerThread::GetCurrentId();
 }
 
 NotificationResources ToNotificationResources(
     std::unique_ptr<blink::WebNotificationResources> web_resources) {
   NotificationResources resources;
@@ skipping 55 matching lines @@
   DCHECK_EQ(0u, notification_data.actions.size());
   DCHECK_EQ(0u, notification_resources->actionIcons.size());
 
   GURL origin_gurl = url::Origin(origin).GetURL();
 
   int notification_id =
       notification_dispatcher_->GenerateNotificationId(CurrentWorkerId());
 
   active_page_notifications_[notification_id] = ActiveNotificationData(
       delegate, origin_gurl,
-      base::UTF16ToUTF8(base::StringPiece16(notification_data.tag)));
+      notification_data.tag.utf8(
+          WebString::UTF8ConversionMode::kStrictReplacingErrorsWithFFFD));
 
   // TODO(mkwst): This is potentially doing the wrong thing with unique
   // origins. Perhaps also 'file:', 'blob:' and 'filesystem:'. See
   // https://crbug.com/490074 for detail.
   thread_safe_sender_->Send(new PlatformNotificationHostMsg_Show(
       notification_id, origin_gurl,
       ToPlatformNotificationData(notification_data),
       ToNotificationResources(std::move(notification_resources))));
 }
 
@@ skipping 64 matching lines @@
   // TODO(peter): GenerateNotificationId is more of a request id. Consider
   // renaming the method in the NotificationDispatcher if this makes sense.
   int request_id =
       notification_dispatcher_->GenerateNotificationId(CurrentWorkerId());
 
   pending_get_notification_requests_.AddWithID(std::move(callbacks),
                                                request_id);
 
   thread_safe_sender_->Send(new PlatformNotificationHostMsg_GetNotifications(
       request_id, service_worker_registration_id, origin,
-      base::UTF16ToUTF8(base::StringPiece16(filter_tag))));
+      filter_tag.utf8(
+          WebString::UTF8ConversionMode::kStrictReplacingErrorsWithFFFD)));
 }
 
 void NotificationManager::close(blink::WebNotificationDelegate* delegate) {
   for (auto& iter : active_page_notifications_) {
     if (iter.second.delegate != delegate)
       continue;
 
     thread_safe_sender_->Send(new PlatformNotificationHostMsg_Close(
         iter.second.origin, iter.second.tag, iter.first));
     active_page_notifications_.erase(iter.first);
     return;
   }
 
   // It should not be possible for Blink to call close() on a Notification which
   // does not exist in either the pending or active notification lists.
   NOTREACHED();
 }
 
 void NotificationManager::closePersistent(
     const blink::WebSecurityOrigin& origin,
     const blink::WebString& tag,
     const blink::WebString& notification_id) {
   thread_safe_sender_->Send(new PlatformNotificationHostMsg_ClosePersistent(
       // TODO(mkwst): This is potentially doing the wrong thing with unique
       // origins. Perhaps also 'file:', 'blob:' and 'filesystem:'. See
       // https://crbug.com/490074 for detail.
-      url::Origin(origin).GetURL(), base::UTF16ToUTF8(base::StringPiece16(tag)),
-      base::UTF16ToUTF8(base::StringPiece16(notification_id))));
+      url::Origin(origin).GetURL(),
+      tag.utf8(WebString::UTF8ConversionMode::kStrictReplacingErrorsWithFFFD),
+      notification_id.utf8(
+          WebString::UTF8ConversionMode::kStrictReplacingErrorsWithFFFD)));
 }
 
 void NotificationManager::notifyDelegateDestroyed(
     blink::WebNotificationDelegate* delegate) {
   for (auto& iter : active_page_notifications_) {
     if (iter.second.delegate != delegate)
       continue;
 
     active_page_notifications_.erase(iter.first);
     return;
@@ skipping 79 matching lines @@
 
     notifications[i] = web_notification_info;
   }
 
   callbacks->onSuccess(notifications);
 
   pending_get_notification_requests_.Remove(request_id);
 }
 
 }  // namespace content