Use NotificationResources instead of a bare SkBitmap.

content/child/notifications/pending_notifications_tracker.h

 // 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.
 
 #ifndef CONTENT_CHILD_NOTIFICATIONS_PENDING_NOTIFICATIONS_TRACKER_H_
 #define CONTENT_CHILD_NOTIFICATIONS_PENDING_NOTIFICATIONS_TRACKER_H_
 
 #include <map>
 
 #include "base/id_map.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "third_party/WebKit/public/platform/modules/notifications/WebNotificationManager.h"
 
 class SkBitmap;
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace blink {
 struct WebNotificationData;
 class WebNotificationDelegate;
 }
 
 namespace content {
 
 class NotificationImageLoader;
-class NotificationManager;
+struct NotificationResources;
 
 // Type definition for the callback signature which is to be invoked when the
 // resources associated with a notification have been fetched.
 using NotificationResourcesFetchedCallback =
-    base::Callback<void(const SkBitmap&)>;
+    base::Callback<void(const NotificationResources&)>;
 
 // Tracks all aspects of all pending Web Notifications. Most notably, it's in
 // charge of ensuring that all resource fetches associated with the notification
 // are completed as expected. The data associated with the notifications is
 // stored in this class, to maintain thread integrity of their members.
 //
 // The pending notification tracker is owned by the NotificationManager, and
 // lives on the thread that manager has been associated with.
 class PendingNotificationsTracker {
  public:
@@ skipping 16 matching lines @@
 
   // Cancels all pending and in-fligth fetches for the page notification
   // identified by |delegate|. Returns if the notification was cancelled.
   bool CancelPageNotificationFetches(blink::WebNotificationDelegate* delegate);
 
  private:
   // To be called on the worker thread when the pending page notification
   // identified by |notification_id| has finished fetching the icon.
   void DidFetchPageNotification(blink::WebNotificationDelegate* delegate,
                                 int notification_id,
                                 const SkBitmap& icon);

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

I imagine that you'll update these as a second step?

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

These methods will probably be nuked from orbit [1]. A new PendingNotification
class will encapsulate fetching multiple resources for a single notification,
and the tracker will become a simpler holder for instances of
PendingNotification.

[1]
https://codereview.chromium.org/1620203004/diff/20001/content/child/notificat...

 
   // To be called on the worker thread when the pending persistent notification
   // identified by |notification_id| has finished fetching the icon.
   void DidFetchPersistentNotification(int notification_id,
                                       const SkBitmap& icon);
 
   // Common code for starting to fetch resources associated with any kind of
   // notification. Will return the id of the pending notification as allocated
   // in the |pending_notifications_| map.
   int FetchNotificationResources(
@@ skipping 13 matching lines @@
   std::map<blink::WebNotificationDelegate*, int> delegate_to_pending_id_map_;
 
   base::WeakPtrFactory<PendingNotificationsTracker> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PendingNotificationsTracker);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_NOTIFICATIONS_PENDING_NOTIFICATIONS_TRACKER_H_