Split FaviconHelper in two: ImageLoadingHelper and FaviconHelper

content/public/common/favicon_url.cc

Index: content/public/common/favicon_url.cc
diff --git a/content/public/common/favicon_url.cc b/content/public/common/favicon_url.cc
index 44f12bc6ed9edf5ec2b85137516c91c27b11233a..7e77aeb355dc520fe09938220abe0cb0bead0e53 100644
--- a/content/public/common/favicon_url.cc
+++ b/content/public/common/favicon_url.cc
@@ -18,4 +18,18 @@ FaviconURL::FaviconURL(const GURL& url, IconType type)
 FaviconURL::~FaviconURL() {
 }
 
+FaviconURL::IconType FaviconURL::ToFaviconType(WebKit::WebIconURL::Type type) {
+  switch (type) {
+    case WebKit::WebIconURL::TypeFavicon:
+      return FaviconURL::FAVICON;
+    case WebKit::WebIconURL::TypeTouch:
+      return FaviconURL::TOUCH_ICON;
+    case WebKit::WebIconURL::TypeTouchPrecomposed:
+      return FaviconURL::TOUCH_PRECOMPOSED_ICON;
+    case WebKit::WebIconURL::TypeInvalid:
+      return FaviconURL::INVALID_ICON;
+  }
+  return FaviconURL::INVALID_ICON;
+}
+
 } // namespace content