Move IconURLs method from WebFrame to WebLocalFrame

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_H_
 #define CONTENT_PUBLIC_COMMON_FAVICON_URL_H_
 
 #include <vector>
 
 #include "content/common/content_export.h"
 #include "ui/gfx/geometry/size.h"
 #include "url/gurl.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
   // favicon_base::IconType.
-  enum IconType {
-    INVALID_ICON = 0x0,
-    FAVICON = 1 << 0,
-    TOUCH_ICON = 1 << 1,
-    TOUCH_PRECOMPOSED_ICON = 1 << 2

[Avi (use Gerrit), 2017/06/06 23:10:04]

They were using bitmasks, but never combining them? :\

[Łukasz Anforowicz, 2017/06/06 23:25:36]

Right - I was rather confused by this: initially I had a weird MAX_BIT_MASK =
FAVICON | TOUCH_ICON | TOUCH_PRECOMPOSED_ICON in patchset 6:
https://codereview.chromium.org/2918903002/patch/100001/110007.

To be fair, blink::WebIconURL::Type *is* used as a bitmask and the values were
most likely mechanically copied from the blink enum.

+  enum class IconType {
+    kInvalid,
+    kFavIcon,
+    kTouchIcon,
+    kTouchPrecomposedIcon,
+    kMax = kTouchPrecomposedIcon,
   };
 
   FaviconURL();
   FaviconURL(const GURL& url,
              IconType type,
              const std::vector<gfx::Size>& sizes);
   FaviconURL(const FaviconURL& other);
   ~FaviconURL();
 
   // The url of the icon.
   GURL icon_url;
 
   // The type of the icon
   IconType icon_type;
 
   // Icon's bitmaps' size
   std::vector<gfx::Size> icon_sizes;
 };
 
 } // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_FAVICON_URL_H_