Split FaviconHelper in two: ImageLoadingHelper and FaviconHelper

content/public/common/favicon_url.h

 // Copyright (c) 2011 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.
 
 #ifndef CONTENT_PUBLIC_COMMON_FAVICON_URL_
 #define CONTENT_PUBLIC_COMMON_FAVICON_URL_
 
 #include "content/common/content_export.h"
 #include "googleurl/src/gurl.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebIconURL.h"
 
 namespace content {
 
 // The favicon url from the render.
 struct CONTENT_EXPORT FaviconURL {
   // The icon type in a page. The definition must be same as history::IconType.
   enum IconType {
     INVALID_ICON = 0x0,
     FAVICON = 1 << 0,
     TOUCH_ICON = 1 << 1,
     TOUCH_PRECOMPOSED_ICON = 1 << 2
   };
 
   FaviconURL();
   FaviconURL(const GURL& url, IconType type);
   ~FaviconURL();
 
+  static IconType ToFaviconType(WebKit::WebIconURL::Type type);

[jam, 2013/03/21 01:14:51]

this is only called in render_view_impl.cc. so no need to put this method in the
public api. keep it as a static method in render_view_impl.cc

[Dmitry Titov, 2013/03/27 22:41:13]

Done.

+
   // The url of the icon.
   GURL icon_url;
 
   // The type of the icon
   IconType icon_type;
 };
 
 } // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_FAVICON_URL_