Use NotificationResources instead of a bare SkBitmap.

content/child/notifications/pending_notifications_tracker.cc

Index: content/child/notifications/pending_notifications_tracker.cc
diff --git a/content/child/notifications/pending_notifications_tracker.cc b/content/child/notifications/pending_notifications_tracker.cc
index 2ee031d4b6741b5aba12c9a61c13b7457f8c0e57..588af7552e3d26983581af1316e1a652cd66894d 100644
--- a/content/child/notifications/pending_notifications_tracker.cc
+++ b/content/child/notifications/pending_notifications_tracker.cc
@@ -8,7 +8,7 @@
 #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"

[Peter Beverloo, 2016/01/26 15:43:23]

Something to think about: so far we've named _most_ things in the //content API
paltform_notification_* to distinguish between the signalling notification
system and this.

Going forth, with the former becoming a more prominent feature, and the latter
largely being deprecated, this isn't such a large problem anymore. I'm OK naming
it NotificationResources - it's much more concise.

[Michael van Ouwerkerk, 2016/01/26 16:24:21]

Right, it's true that "notification" is very overloaded throughout our codebase.
To be honest, I never found the "platform" prefix very clear and a more specific
prefix would have worked better for me, but not sure what. I'll take your cue on
consistency and readability on this one.

 #include "third_party/WebKit/public/platform/modules/notifications/WebNotificationData.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
@@ -75,7 +75,9 @@ void PendingNotificationsTracker::DidFetchPageNotification(
       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);
@@ -87,7 +89,9 @@ void PendingNotificationsTracker::DidFetchPersistentNotification(
       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);
 }