Use NotificationResources instead of a bare SkBitmap.

content/child/notifications/pending_notifications_tracker.cc

 // Copyright 2015 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/pending_notifications_tracker.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/thread_task_runner_handle.h"
 #include "content/child/notifications/notification_image_loader.h"
-#include "content/child/notifications/notification_manager.h"
+#include "content/public/common/notification_resources.h"
 #include "third_party/WebKit/public/platform/modules/notifications/WebNotificationData.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace content {
 
 // Stores the information associated with a pending notification.
 struct PendingNotificationsTracker::PendingNotification {
   PendingNotification(
       const scoped_refptr<NotificationImageLoader>& image_loader,
       const NotificationResourcesFetchedCallback& callback)
@@ skipping 46 matching lines @@
 }
 
 void PendingNotificationsTracker::DidFetchPageNotification(
     blink::WebNotificationDelegate* delegate,
     int notification_id,
     const SkBitmap& icon) {
   PendingNotification* pending_notification =
       pending_notifications_.Lookup(notification_id);
   DCHECK(pending_notification);
 
-  pending_notification->callback.Run(icon);
+  NotificationResources notification_resources;
+  notification_resources.notification_icon = icon;
+  pending_notification->callback.Run(notification_resources);
 
   delegate_to_pending_id_map_.erase(delegate);
   pending_notifications_.Remove(notification_id);
 }
 
 void PendingNotificationsTracker::DidFetchPersistentNotification(
     int notification_id, const SkBitmap& icon) {
   PendingNotification* pending_notification =
       pending_notifications_.Lookup(notification_id);
   DCHECK(pending_notification);
 
-  pending_notification->callback.Run(icon);
+  NotificationResources notification_resources;
+  notification_resources.notification_icon = icon;
+  pending_notification->callback.Run(notification_resources);
 
   pending_notifications_.Remove(notification_id);
 }
 
 int PendingNotificationsTracker::FetchNotificationResources(
     const blink::WebNotificationData& notification_data,
     const NotificationResourcesFetchedCallback& callback,
     const scoped_refptr<NotificationImageLoader>& image_loader) {
   int notification_id = pending_notifications_.Add(
       new PendingNotification(image_loader, callback));
 
   main_thread_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&NotificationImageLoader::StartOnMainThread, image_loader,
                  notification_id, GURL(notification_data.icon)));
 
   return notification_id;
 }
 
 }  // namespace content