CallbackPromiseAdapter types should be more compatible with WebCallbacks (2/3).

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 <cmath>
 
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 273 matching lines @@
 
 void NotificationManager::OnDidGetNotifications(
     int request_id,
     const std::vector<PersistentNotificationInfo>& notification_infos) {
   blink::WebNotificationGetCallbacks* callbacks =
       pending_get_notification_requests_.Lookup(request_id);
   DCHECK(callbacks);
   if (!callbacks)
     return;
 
-  scoped_ptr<blink::WebVector<blink::WebPersistentNotificationInfo>>
-      notifications(new blink::WebVector<blink::WebPersistentNotificationInfo>(
-          notification_infos.size()));
+  blink::WebVector<blink::WebPersistentNotificationInfo> notifications(
+      notification_infos.size());
 
   for (size_t i = 0; i < notification_infos.size(); ++i) {
     blink::WebPersistentNotificationInfo web_notification_info;
     web_notification_info.persistentId = notification_infos[i].first;
     web_notification_info.data =
         ToWebNotificationData(notification_infos[i].second);
 
-    (*notifications)[i] = web_notification_info;
+    notifications[i] = web_notification_info;
   }
 
-  callbacks->onSuccess(notifications.release());
+  callbacks->onSuccess(notifications);
 
   pending_get_notification_requests_.Remove(request_id);
 }
 
 void NotificationManager::DisplayPageNotification(
     const blink::WebSecurityOrigin& origin,
     const blink::WebNotificationData& notification_data,
     blink::WebNotificationDelegate* delegate,
     const SkBitmap& icon) {
   int notification_id =
@@ skipping 24 matching lines @@
 
   // 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_ShowPersistent(
       request_id, service_worker_registration_id, GURL(origin.toString()), icon,
       ToPlatformNotificationData(notification_data)));
 }
 
 }  // namespace content