Factor out a PendingNotificationTracker from the NotificationManager.

content/child/notifications/notification_manager.h

Index: content/child/notifications/notification_manager.h
diff --git a/content/child/notifications/notification_manager.h b/content/child/notifications/notification_manager.h
index 47d979d5b2730d1fe5e9c58ad9b7a1ed0a8fb13a..1f5c3a443d797f00edd913f8c72e8091ff537368 100644
--- a/content/child/notifications/notification_manager.h
+++ b/content/child/notifications/notification_manager.h
@@ -8,21 +8,15 @@
 #include <map>
 #include <set>
 
-#include "base/id_map.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "content/child/notifications/notification_dispatcher.h"
-#include "content/child/notifications/notification_image_loader.h"
+#include "content/child/notifications/pending_notification_tracker.h"
 #include "content/child/worker_task_runner.h"
 #include "third_party/WebKit/public/platform/modules/notifications/WebNotificationManager.h"
 
 class SkBitmap;
 
-namespace blink {
-class WebURL;
-}
-
 namespace content {
 
 class ThreadSafeSender;
@@ -39,6 +33,23 @@ class NotificationManager : public blink::WebNotificationManager,
       base::SingleThreadTaskRunner* main_thread_task_runner,
       NotificationDispatcher* notification_dispatcher);
 
+  // To be called when a page notification is ready to be displayed. Will
+  // inform the browser process about all available data.
+  void DisplayPageNotification(
+      const blink::WebSerializedOrigin& origin,
+      const blink::WebNotificationData& notification_data,
+      blink::WebNotificationDelegate* delegate,

[mlamouri (slow - plz ping), 2015/02/18 14:53:58]

Could you explain in the comment what |delegate| is for?

[Peter Beverloo, 2015/02/18 15:11:50]

Done.

+      const SkBitmap& icon);

[mlamouri (slow - plz ping), 2015/02/18 14:53:58]

Could you move the |icon| above |delegate|?

[Peter Beverloo, 2015/02/18 15:11:50]

Why? Everything but |icon| is present in show() and is fed through the
PendingNotificationTracker without being modified. |icon| is the thing that we
add "on top". It makes sense for it to be last.

+
+  // To be called when a persistent notification is ready to be displayed. Will
+  // inform the browser process about all available data.
+  void DisplayPersistentNotification(
+      const blink::WebSerializedOrigin& origin,
+      const blink::WebNotificationData& notification_data,
+      int64 service_worker_registration_id,
+      scoped_ptr<blink::WebNotificationShowCallbacks> callbacks,

[mlamouri (slow - plz ping), 2015/02/18 14:53:58]

Could you explain in the comment what |callbacks| and
|service_worker_registration_id| are for.

[Peter Beverloo, 2015/02/18 15:11:50]

Done.

+      const SkBitmap& icon);

[mlamouri (slow - plz ping), 2015/02/18 14:53:58]

Could you move the |icon| below |notification_data| so the first three arguments
are the same for both methods?

[Peter Beverloo, 2015/02/18 15:11:50]

Dito.

+
   // WorkerTaskRunner::Observer implementation.
   void OnWorkerRunLoopStopped() override;
 
@@ -73,56 +84,15 @@ class NotificationManager : public blink::WebNotificationManager,
   void OnDidClose(int notification_id);
   void OnDidClick(int notification_id);
 
-  // Asynchronously starts loading |image_url| on the main thread and returns a
-  // reference to the notification image loaded responsible for this. |callback|
-  // will be invoked on the calling thread when the load is complete.
-  scoped_refptr<NotificationImageLoader> CreateImageLoader(
-      const blink::WebURL& image_url,
-      const NotificationImageLoadedCallback& callback) const;
-
-  // Sends an IPC to the browser process to display the notification,
-  // accompanied by the downloaded icon.
-  void DisplayNotification(const blink::WebSerializedOrigin& origin,
-                           const blink::WebNotificationData& notification_data,
-                           blink::WebNotificationDelegate* delegate,
-                           scoped_refptr<NotificationImageLoader> image_loader);
-
-  // Sends an IPC to the browser process to display the persistent notification,
-  // accompanied by the downloaded icon.
-  void DisplayPersistentNotification(
-      const blink::WebSerializedOrigin& origin,
-      const blink::WebNotificationData& notification_data,
-      int64 service_worker_registration_id,
-      int request_id,
-      scoped_refptr<NotificationImageLoader> image_loader);
-
-  // Removes the notification identified by |delegate| from the set of
-  // pending notifications, and returns whether it could be found.
-  bool RemovePendingPageNotification(blink::WebNotificationDelegate* delegate);
-
   scoped_refptr<ThreadSafeSender> thread_safe_sender_;
-  scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
   scoped_refptr<NotificationDispatcher> notification_dispatcher_;
 
-  // Tracking display requests for persistent notifications.
-  IDMap<blink::WebNotificationShowCallbacks, IDMapOwnPointer>
-      persistent_notification_requests_;
-
-  // A map tracking Page-bound notifications whose icon is still being
-  // downloaded. These downloads can be cancelled by the developer.
-  std::map<blink::WebNotificationDelegate*,
-           scoped_refptr<NotificationImageLoader>>
-      pending_page_notifications_;
-
-  // A set tracking Persistent notifications whose icon is still being
-  // downloaded. These downloads cannot be cancelled by the developer.
-  std::set<scoped_refptr<NotificationImageLoader>>
-      pending_persistent_notifications_;
+  // Tracker which stores all pending Notifications, both page and persistent
+  // ones, until all their associated resources have been fetched.
+  PendingNotificationTracker pending_notifications_;
 
   // Map to store the delegate associated with a notification request Id.
-  std::map<int, blink::WebNotificationDelegate*> active_notifications_;
-
-  base::WeakPtrFactory<NotificationManager> weak_factory_;
+  std::map<int, blink::WebNotificationDelegate*> active_page_notifications_;
 
   DISALLOW_COPY_AND_ASSIGN(NotificationManager);
 };