Move IconURLs method from WebFrame to WebLocalFrame

components/favicon/content/favicon_url_util.cc

 // Copyright 2015 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.
 
 #include "components/favicon/content/favicon_url_util.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "components/favicon/core/favicon_url.h"
 #include "components/favicon_base/favicon_types.h"
 #include "content/public/common/favicon_url.h"
 
 namespace favicon {
 namespace {
 
 favicon_base::IconType IconTypeFromContentIconType(
     content::FaviconURL::IconType icon_type) {
   switch (icon_type) {
     case content::FaviconURL::FAVICON:
       return favicon_base::FAVICON;
     case content::FaviconURL::TOUCH_ICON:
       return favicon_base::TOUCH_ICON;
     case content::FaviconURL::TOUCH_PRECOMPOSED_ICON:
       return favicon_base::TOUCH_PRECOMPOSED_ICON;
     case content::FaviconURL::INVALID_ICON:
       return favicon_base::INVALID_ICON;
+    default:

[dcheng, 2017/06/06 20:01:30]

Nit: prefer to keep this out of the switch statement, so the compiler can warn
on new (unhandled) values.

[Łukasz Anforowicz, 2017/06/06 20:55:00]

Thanks for bringing this up.  I moved this in, because the compiler started
complaining about MAX_BIT_MASK field being unhandled.  Hmmm... I think I got
confused here - I think that content::FaviconURL::IconType is NOT a bitmask and
should be rewritten to avoid using the shift operator when defining enum values
(OTOH blink::WebIconURL::Type is indeed a bitmask).

So - in the next patchset I changed content::FaviconURL::IconType so that:
- It uses consecutive values (0,1,2,3,4... rather than 0,1,2,4,8,...)
- It is a class enum that uses kModernChromiumStyleNaming (this is not
technically required, but let's me find and inspect all uses to make sure nobody
uses this enum as a bitmask).

Done (I think).

+      NOTREACHED();
+      return favicon_base::INVALID_ICON;
   }
-  NOTREACHED();
-  return favicon_base::INVALID_ICON;
 }
 
 }  // namespace
 
 FaviconURL FaviconURLFromContentFaviconURL(
     const content::FaviconURL& favicon_url) {
   return FaviconURL(favicon_url.icon_url,
                     IconTypeFromContentIconType(favicon_url.icon_type),
                     favicon_url.icon_sizes);
 }
 
 std::vector<FaviconURL> FaviconURLsFromContentFaviconURLs(
     const std::vector<content::FaviconURL>& favicon_urls) {
   std::vector<FaviconURL> result;
   result.reserve(favicon_urls.size());
   std::transform(favicon_urls.begin(), favicon_urls.end(),
                  std::back_inserter(result), FaviconURLFromContentFaviconURL);
   return result;
 }
 
 }  // namespace favicon