Extend FaviconService to support fetching favicons from a Google server

components/favicon_base/favicon_types.h

 // Copyright 2014 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 COMPONENTS_FAVICON_BASE_FAVICON_TYPES_H_
 #define COMPONENTS_FAVICON_BASE_FAVICON_TYPES_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 48 matching lines @@
   // Returns true if |bitmap_data| contains a valid bitmap.
   bool is_valid() const { return bitmap_data.get() && bitmap_data->size(); }
 
   // Indicates whether |bitmap_data| is expired.
   bool expired;
 
   // The bits of the bitmap.
   scoped_refptr<base::RefCountedMemory> bitmap_data;
 
   // The pixel dimensions of |bitmap_data|.
+  // TODO(jkrcal): Remove this and only use pixel_size_in_db (crbug.com/675637).
   gfx::Size pixel_size;
 
+  // The pixel dimensions of the bitmap stored in the database. Icons are
+  // resized prior to storing into the database so the dimensions are different
+  // than those of the bitmap at |icon_url|. The dimensions are taken prior to
+  // the resizing in FaviconService::Get###().
+  gfx::Size pixel_size_in_db;
+
   // The URL of the containing favicon.
   GURL icon_url;
 
   // The icon type of the containing favicon.
   IconType icon_type;
 };
 
 // Define type with same structure as FaviconRawBitmapResult for passing data to
 // HistoryBackend::SetFavicons().
 typedef FaviconRawBitmapResult FaviconRawBitmapData;
@@ skipping 14 matching lines @@
   FaviconRawBitmapResult bitmap;
 
   // The fallback icon style if a sufficiently large icon isn't available. This
   // uses the dominant color of a smaller icon as the background if available.
   std::unique_ptr<FallbackIconStyle> fallback_icon_style;
 };
 
 }  // namespace favicon_base
 
 #endif  // COMPONENTS_FAVICON_BASE_FAVICON_TYPES_H_