Remove EventSender from ImageLoader

third_party/WebKit/Source/core/loader/ImageLoader.h

Index: third_party/WebKit/Source/core/loader/ImageLoader.h
diff --git a/third_party/WebKit/Source/core/loader/ImageLoader.h b/third_party/WebKit/Source/core/loader/ImageLoader.h
index 175b8c6d99bb4bd15238628ebd8d7a1198cace0a..0a55829db4e574f61f3eab76067adf46ab5b8642 100644
--- a/third_party/WebKit/Source/core/loader/ImageLoader.h
+++ b/third_party/WebKit/Source/core/loader/ImageLoader.h
@@ -25,6 +25,7 @@
 
 #include <memory>
 #include "core/CoreExport.h"
+#include "core/dom/TaskRunnerHelper.h"
 #include "core/loader/resource/ImageResource.h"
 #include "core/loader/resource/ImageResourceContent.h"
 #include "core/loader/resource/ImageResourceObserver.h"
@@ -40,10 +41,6 @@ class Element;
 class ImageLoader;
 class LayoutImageResource;
 
-template <typename T>
-class EventSender;
-using ImageEventSender = EventSender<ImageLoader>;
-
 class CORE_EXPORT ImageLoader : public GarbageCollectedFinalized<ImageLoader>,
                                 public ImageResourceObserver {
   USING_PRE_FINALIZER(ImageLoader, Dispose);
@@ -112,15 +109,10 @@ class CORE_EXPORT ImageLoader : public GarbageCollectedFinalized<ImageLoader>,
 
   bool HasPendingActivity() const { return HasPendingEvent() || pending_task_; }
 
-  bool HasPendingError() const { return has_pending_error_event_; }
+  bool HasPendingError() const { return pending_error_event_.IsActive(); }
 
   bool HadError() const { return !failed_load_url_.IsEmpty(); }
 
-  void DispatchPendingEvent(ImageEventSender*);
-
-  static void DispatchPendingLoadEvents();
-  static void DispatchPendingErrorEvents();
-
   bool GetImageAnimationPolicy(ImageAnimationPolicy&) final;
 
  protected:
@@ -142,8 +134,8 @@ class CORE_EXPORT ImageLoader : public GarbageCollectedFinalized<ImageLoader>,
   bool HasPendingEvent() const;
   void UpdatedHasPendingEvent();
 
-  void DispatchPendingLoadEvent();
-  void DispatchPendingErrorEvent();
+  void DispatchPendingLoadEvent(std::unique_ptr<IncrementLoadEventDelayCount>);
+  void DispatchPendingErrorEvent(std::unique_ptr<IncrementLoadEventDelayCount>);
 
   LayoutImageResource* GetLayoutImageResource();
   void UpdateLayoutObject();
@@ -206,10 +198,8 @@ class CORE_EXPORT ImageLoader : public GarbageCollectedFinalized<ImageLoader>,
   std::unique_ptr<IncrementLoadEventDelayCount>
       delay_until_image_notify_finished_;
 
-  // Indicates whether there is a pending task for the load/error event on
-  // EventSender. Will be replaced when EventSender is removed crbug/624697.
-  bool has_pending_load_event_ : 1;
-  bool has_pending_error_event_ : 1;
+  TaskHandle pending_load_event_;
+  TaskHandle pending_error_event_;
 
   bool image_complete_ : 1;
   bool loading_image_document_ : 1;