Extend FaviconService to support fetching favicons from a Google server

components/history/core/browser/history_backend.cc

 // Copyright (c) 2012 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/history/core/browser/history_backend.h"
 
 #include <algorithm>
 #include <functional>
 #include <list>
 #include <map>
@@ skipping 1514 matching lines @@
     return;
   }
 
   base::Time last_updated;
   favicon_base::FaviconRawBitmapResult bitmap_result;
   bitmap_result.icon_url = icon_url;
   bitmap_result.icon_type = icon_type;
   if (!thumbnail_db_->GetFaviconBitmap(largest_icon.bitmap_id,
                                        &last_updated, nullptr,
                                        &bitmap_result.bitmap_data,
-                                       &bitmap_result.pixel_size)) {
+                                       &bitmap_result.pixel_size_in_db)) {
     return;
   }
 
+  // Before the bitmap gets resized, the real size is the same as the DB size.
+  bitmap_result.pixel_size = bitmap_result.pixel_size_in_db;
+
   bitmap_result.expired =
       (Time::Now() - last_updated) > TimeDelta::FromDays(kFaviconRefetchDays);
   if (bitmap_result.is_valid())
     *favicon_bitmap_result = bitmap_result;
 
   LOCAL_HISTOGRAM_TIMES("History.GetLargestFaviconForURL",
                         TimeTicks::Now() - beginning_time);
 }
 
 void HistoryBackend::GetFaviconsForURL(
     const GURL& page_url,
     int icon_types,
     const std::vector<int>& desired_sizes,
     std::vector<favicon_base::FaviconRawBitmapResult>* bitmap_results) {
   TRACE_EVENT0("browser", "HistoryBackend::GetFaviconsForURL");
   DCHECK(bitmap_results);
   GetFaviconsFromDB(page_url, icon_types, desired_sizes, bitmap_results);
 
   if (desired_sizes.size() == 1)
     bitmap_results->assign(1, favicon_base::ResizeFaviconBitmapResult(
                                   *bitmap_results, desired_sizes[0]));

[pkotwicz, 2016/12/19 00:03:29]

You need to update ResizeFaviconBitmapResult() in order to set the correct
pixel_size_in_db

You should add tests too :)

[jkrcal, 2016/12/19 17:07:19]

Isn't the struct copied in favicon_util.cc:209 incl. the pixel_size_in_db?
Later, the function only overwrites pixel_size which seems okay to me.

Will add unit-tests, in a later patch set.

[pkotwicz, 2016/12/20 02:33:01]

You are right ResizeFaviconBitmapResult() does a copy. I am very sorry about the
confusion.

[jkrcal, 2017/02/06 19:01:22]

Added a simple unit-test.

 }
 
 void HistoryBackend::GetFaviconForID(
     favicon_base::FaviconID favicon_id,
     int desired_size,
     std::vector<favicon_base::FaviconRawBitmapResult>* bitmap_results) {
   TRACE_EVENT0("browser", "HistoryBackend::GetFaviconForID");
   std::vector<favicon_base::FaviconID> favicon_ids;
   favicon_ids.push_back(favicon_id);
   std::vector<int> desired_sizes;
@@ skipping 495 matching lines @@
     return false;
   }
 
   for (size_t i = 0; i < best_bitmap_ids.size(); ++i) {
     base::Time last_updated;
     favicon_base::FaviconRawBitmapResult bitmap_result;
     bitmap_result.icon_url = icon_url;
     bitmap_result.icon_type = icon_type;
     if (!thumbnail_db_->GetFaviconBitmap(best_bitmap_ids[i], &last_updated,
                                          nullptr, &bitmap_result.bitmap_data,
-                                         &bitmap_result.pixel_size)) {
+                                         &bitmap_result.pixel_size_in_db)) {
       return false;
     }
 
+    // Before the bitmap gets resized, the real size is the same as the DB size.
+    bitmap_result.pixel_size = bitmap_result.pixel_size_in_db;
+
     bitmap_result.expired =
         (Time::Now() - last_updated) > TimeDelta::FromDays(kFaviconRefetchDays);
     if (bitmap_result.is_valid())
       favicon_bitmap_results->push_back(bitmap_result);
   }
   return true;
 }
 
 bool HistoryBackend::SetFaviconMappingsForPageAndRedirects(
     const GURL& page_url,
@@ skipping 557 matching lines @@
   // transaction is currently open.
   db_->CommitTransaction();
   db_->Vacuum();
   db_->BeginTransaction();
   db_->GetStartDate(&first_recorded_time_);
 
   return true;
 }
 
 }  // namespace history