Split FaviconHelper in two: ImageLoadingHelper and FaviconHelper

content/common/image_messages.h

Index: content/common/image_messages.h
diff --git a/content/common/icon_messages.h b/content/common/image_messages.h
similarity index 45%
rename from content/common/icon_messages.h
rename to content/common/image_messages.h
index 63f9ab9351515c64e245f2c5eff21951db8931a2..78d7cff7d47fc55523d3b8b5e62a3d99ee51a022 100644
--- a/content/common/icon_messages.h
+++ b/content/common/image_messages.h
@@ -5,42 +5,29 @@
 // Multiply-included message file, no traditional include guard.
 #include <vector>
 
-#include "content/public/common/favicon_url.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_param_traits.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
-#define IPC_MESSAGE_START IconMsgStart
-
-IPC_ENUM_TRAITS(content::FaviconURL::IconType)
-
-IPC_STRUCT_TRAITS_BEGIN(content::FaviconURL)
-  IPC_STRUCT_TRAITS_MEMBER(icon_url)
-  IPC_STRUCT_TRAITS_MEMBER(icon_type)
-IPC_STRUCT_TRAITS_END()
+#define IPC_MESSAGE_START ImageMsgStart
 
 // Messages sent from the browser to the renderer.
 
-// Requests the renderer to download the specified favicon image, decode it,
-// and send the image data back via IconHostMsg_DidDownloadFavicon.
-IPC_MESSAGE_ROUTED4(IconMsg_DownloadFavicon,
+// Requests the renderer to download the specified image, decode it,
+// and send the image data back via ImageHostMsg_DidDownloadImage.
+IPC_MESSAGE_ROUTED4(ImageMsg_DownloadImage,
                     int /* identifier for the request */,
                     GURL /* URL of the image */,
                     bool /* is favicon (turn off cookies) */,
-                    int /* Preferred favicon size. Passed on to
-                           IconHostMsg_DidDownloadFavicon, unused otherwise */)
+                    int /* Preferred image size. Passed on to
+                           ImageHostMsg_DidDownloadFavicon, unused otherwise */)
 
 // Messages sent from the renderer to the browser.
 
-// Notification that the urls for the favicon of a site has been determined.
-IPC_MESSAGE_ROUTED2(IconHostMsg_UpdateFaviconURL,
-                    int32 /* page_id */,
-                    std::vector<content::FaviconURL> /* urls of the favicon */)
-
-IPC_MESSAGE_ROUTED4(IconHostMsg_DidDownloadFavicon,
+IPC_MESSAGE_ROUTED4(ImageHostMsg_DidDownloadImage,
                     int /* Identifier of the request */,
                     GURL /* URL of the image */,
-                    int /* Preferred icon size passed to
-                           IconMsg_DownloadFavicon */,
+                    int /* Preferred image size passed to
+                           ImageMsg_DownloadImage */,
                     std::vector<SkBitmap> /* image_data */)