Modify ResourceFetcher to use WebURLLoader instead of ResourceHandle....

webkit/glue/webview_impl.h

Index: webkit/glue/webview_impl.h
===================================================================
--- webkit/glue/webview_impl.h	(revision 19821)
+++ webkit/glue/webview_impl.h	(working copy)
@@ -13,6 +13,7 @@
 #include "webkit/api/public/WebPoint.h"
 #include "webkit/api/public/WebSize.h"
 #include "webkit/glue/back_forward_list_client_impl.h"
+#include "webkit/glue/image_resource_fetcher.h"
 #include "webkit/glue/webframe_impl.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/webview.h"
@@ -43,7 +44,6 @@
 }
 
 class AutocompletePopupMenuClient;
-class ImageResourceFetcher;
 class SearchableFormData;
 class WebHistoryItemImpl;
 class WebDevToolsAgent;
@@ -211,11 +211,6 @@
   // Start a system drag and drop operation.
   void StartDragging(const WebKit::WebDragData& drag_data);
 
-  // ImageResourceFetcher callback.
-  void ImageResourceDownloadDone(ImageResourceFetcher* fetcher,
-                                 bool errored,
-                                 const SkBitmap& image);
-
   // Hides the autocomplete popup if it is showing.
   void HideAutoCompletePopup();
 
@@ -227,6 +222,10 @@
   friend class WebView;  // So WebView::Create can call our constructor
   friend class base::RefCounted<WebViewImpl>;
 
+  // ImageResourceFetcher::Callback.
+  void OnImageFetchComplete(webkit_glue::ImageResourceFetcher* fetcher,
+                            const SkBitmap& bitmap);
+
   WebViewImpl();
   ~WebViewImpl();
 
@@ -280,7 +279,7 @@
 
   // Removes fetcher from the set of pending image fetchers and deletes it.
   // This is invoked after the download is completed (or fails).
-  void DeleteImageResourceFetcher(ImageResourceFetcher* fetcher);
+  void DeleteImageResourceFetcher(webkit_glue::ImageResourceFetcher* fetcher);
 
   // Converts |pos| from window coordinates to contents coordinates and gets
   // the HitTestResult for it.
@@ -288,7 +287,7 @@
       const WebCore::IntPoint& pos);
 
   // ImageResourceFetchers schedule via DownloadImage.
-  std::set<ImageResourceFetcher*> image_fetchers_;
+  std::set<webkit_glue::ImageResourceFetcher*> image_fetchers_;
 
   // The point relative to the client area where the mouse was last pressed
   // down. This is used by the drag client to determine what was under the