Factor out a PendingNotificationTracker from the NotificationManager.

content/child/notifications/notification_image_loader.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_image_loader.h"
 
 #include "base/logging.h"
 #include "base/thread_task_runner_handle.h"
 #include "content/child/child_thread_impl.h"
 #include "content/child/image_decoder.h"
 #include "third_party/WebKit/public/platform/Platform.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/platform/WebURLLoader.h"
+#include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 using blink::WebURL;
 using blink::WebURLError;
 using blink::WebURLLoader;
 using blink::WebURLRequest;
 
 namespace content {
 
 NotificationImageLoader::NotificationImageLoader(
-    const NotificationImageLoadedCallback& callback)
+    const ImageLoadCompletedCallback& callback,
+    const scoped_refptr<base::SingleThreadTaskRunner>& worker_task_runner)
     : callback_(callback),
+      worker_task_runner_(worker_task_runner),
+      notification_id_(0),
       completed_(false) {}
 
 NotificationImageLoader::~NotificationImageLoader() {
   // The WebURLLoader instance must be destroyed on the same thread it was
   // created on, being the main thread.
   if (!main_thread_task_runner_->RunsTasksOnCurrentThread())
     main_thread_task_runner_->DeleteSoon(FROM_HERE, url_loader_.release());
 }
 
-void NotificationImageLoader::StartOnMainThread(
-    const WebURL& image_url,
-    const scoped_refptr<base::SingleThreadTaskRunner>& worker_task_runner) {
+void NotificationImageLoader::StartOnMainThread(int notification_id,
+                                                const GURL& image_url) {
   DCHECK(ChildThreadImpl::current());
   DCHECK(!url_loader_);
-  DCHECK(worker_task_runner);

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

Would it make sense to have:
DCHECK(!worker_task_runner_->BelongsToCurrentThread()); ?

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

No, because it's possible for the worker_task_runner to be the main thread (in
case the document is being shown from a Document).

 
-  worker_task_runner_ = worker_task_runner;
   main_thread_task_runner_ = base::ThreadTaskRunnerHandle::Get();
+  notification_id_ = notification_id;
 
-  WebURLRequest request(image_url);
+  WebURL imageUrl(image_url);

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

nit: coding style.

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

Done.

+  WebURLRequest request(imageUrl);
   request.setRequestContext(WebURLRequest::RequestContextImage);
 
   url_loader_.reset(blink::Platform::current()->createURLLoader());
   url_loader_->loadAsynchronously(request, this);
 }
 
-SkBitmap NotificationImageLoader::GetDecodedImage() const {
-  if (buffer_.empty())
-    return SkBitmap();
-
-  ImageDecoder decoder;
-  return decoder.Decode(&buffer_[0], buffer_.size());
-}
-
 void NotificationImageLoader::didReceiveData(
     WebURLLoader* loader,
     const char* data,
     int data_length,
     int encoded_data_length) {
   DCHECK(!completed_);
   DCHECK_GT(data_length, 0);
 
   buffer_.insert(buffer_.end(), data, data + data_length);
 }
 
 void NotificationImageLoader::didFinishLoading(
     WebURLLoader* loader,
     double finish_time,
     int64_t total_encoded_data_length) {
   DCHECK(!completed_);
 
   RunCallbackOnWorkerThread();
 }
 
 void NotificationImageLoader::didFail(WebURLLoader* loader,
                                       const WebURLError& error) {
   if (completed_)
     return;
 
   RunCallbackOnWorkerThread();
 }
 
 void NotificationImageLoader::RunCallbackOnWorkerThread() {
-  scoped_refptr<NotificationImageLoader> loader = make_scoped_refptr(this);
-  if (worker_task_runner_->BelongsToCurrentThread())
-    callback_.Run(loader);
-  else
-    worker_task_runner_->PostTask(FROM_HERE, base::Bind(callback_, loader));
+  SkBitmap icon;
+  if (!buffer_.empty()) {
+    ImageDecoder decoder;
+    icon = decoder.Decode(&buffer_[0], buffer_.size());
+  }

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

What was wrong with GetDecodedImage? Maybe you could do something like:
  completede_ = true;
  SkBitmap icon = GetDecodedImage();

and add a:
  DCHECK(completed_);

in ::GetDecodedImage().

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

What was wrong with GetDecodedImage? Maybe you could do something like:
  completede_ = true;
  SkBitmap icon = GetDecodedImage();

and add a:
  DCHECK(completed_);

in ::GetDecodedImage().

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

Nothing. Restored.

+
+  url_loader_.reset();
+  completed_ = true;
+
+  if (worker_task_runner_->BelongsToCurrentThread()) {
+    callback_.Run(notification_id_, icon);
+  } else {
+    worker_task_runner_->PostTask(
+        FROM_HERE, base::Bind(callback_, notification_id_, icon));
+  }
 }
 
 }  // namespace content