Remove a renderer -> browser roundtrip for resolving the showNotification promise.

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 "base/lazy_instance.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_local.h"
 #include "content/child/notifications/notification_data_conversions.h"
@@ skipping 155 matching lines @@
       blink::WebNotificationPermissionAllowed;
   thread_safe_sender_->Send(new PlatformNotificationHostMsg_CheckPermission(
       GURL(origin.string()), &permission));
 
   return permission;
 }
 
 bool NotificationManager::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(NotificationManager, message)
-    IPC_MESSAGE_HANDLER(PlatformNotificationMsg_DidShowPersistent,
-                        OnDidShowPersistent)
     IPC_MESSAGE_HANDLER(PlatformNotificationMsg_DidShow, OnDidShow);
     IPC_MESSAGE_HANDLER(PlatformNotificationMsg_DidClose, OnDidClose);
     IPC_MESSAGE_HANDLER(PlatformNotificationMsg_DidClick, OnDidClick);
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled;
 }
 
-void NotificationManager::OnDidShowPersistent(int request_id) {
-  blink::WebNotificationShowCallbacks* callbacks =
-      persistent_notification_requests_.Lookup(request_id);
-  DCHECK(callbacks);
-
-  // There currently isn't a case in which the promise would be rejected per
-  // our implementation, so always resolve it here.
-  callbacks->onSuccess();
-
-  persistent_notification_requests_.Remove(request_id);
-}
-
 void NotificationManager::OnDidShow(int notification_id) {
   const auto& iter = active_notifications_.find(notification_id);
   if (iter == active_notifications_.end())
     return;
 
   iter->second->dispatchShowEvent();
 }
 
 void NotificationManager::OnDidClose(int notification_id) {
   const auto& iter = active_notifications_.find(notification_id);
@@ skipping 52 matching lines @@
   // If this Notification contained an icon, it can be safely deleted now.
   RemovePendingPageNotification(delegate);
 }
 
 void NotificationManager::DisplayPersistentNotification(
     const blink::WebSerializedOrigin& origin,
     const blink::WebNotificationData& notification_data,
     int64 service_worker_registration_id,
     int request_id,
     scoped_refptr<NotificationImageLoader> image_loader) {
+  blink::WebNotificationShowCallbacks* callbacks =
+      persistent_notification_requests_.Lookup(request_id);
+  DCHECK(callbacks);
+
   SkBitmap icon;
   if (image_loader) {
     pending_persistent_notifications_.erase(image_loader);
     icon = image_loader->GetDecodedImage();
   }
 
   thread_safe_sender_->Send(
       new PlatformNotificationHostMsg_ShowPersistent(
-          request_id,
           service_worker_registration_id,
           GURL(origin.string()),
           icon,
           ToPlatformNotificationData(notification_data)));
+
+  // There currently isn't a case in which the promise would be rejected per
+  // our implementation, so always resolve it here.
+  callbacks->onSuccess();
+
+  persistent_notification_requests_.Remove(request_id);
 }
 
 bool NotificationManager::RemovePendingPageNotification(
     blink::WebNotificationDelegate* delegate) {
   const auto& iter = pending_page_notifications_.find(delegate);
   if (iter == pending_page_notifications_.end())
     return false;
 
   pending_page_notifications_.erase(iter);
   return true;
 }
 
 }  // namespace content