Change FaviconData to be able to return data for multiple bitmaps for same icon URL

chrome/browser/sync/glue/session_model_associator.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 "chrome/browser/sync/glue/session_model_associator.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 24 matching lines @@
 #include "sync/internal_api/public/read_node.h"
 #include "sync/internal_api/public/read_transaction.h"
 #include "sync/internal_api/public/write_node.h"
 #include "sync/internal_api/public/write_transaction.h"
 #include "sync/protocol/session_specifics.pb.h"
 #include "sync/syncable/directory.h"
 #include "sync/syncable/read_transaction.h"
 #include "sync/syncable/write_transaction.h"
 #include "sync/util/get_session_name.h"
 #include "sync/util/time.h"
+#include "ui/gfx/favicon_size.h"
 #if defined(OS_LINUX)
 #include "base/linux_util.h"
 #elif defined(OS_WIN)
 #include <windows.h>
 #elif defined(OS_ANDROID)
 #include "sync/util/session_utils_android.h"
 #endif
 
 using content::BrowserThread;
 using content::NavigationEntry;
@@ skipping 489 matching lines @@
   FaviconService* favicon_service =
       FaviconServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
   if (!favicon_service)
     return;
   SessionID::id_type tab_id = tab_link->tab()->GetSessionId();
   if (tab_link->favicon_load_handle()) {
     // We have an outstanding favicon load for this tab. Cancel it.
     load_consumer_.CancelAllRequestsForClientData(tab_id);
   }
   DVLOG(1) << "Triggering favicon load for url " << tab_link->url().spec();
-  FaviconService::Handle handle = favicon_service->GetFaviconForURL(
-      profile_, tab_link->url(), history::FAVICON, &load_consumer_,
+  FaviconService::Handle handle = favicon_service->GetRawFaviconForURL(
+      profile_, tab_link->url(), history::FAVICON, gfx::kFaviconSize,
+      ui::SCALE_FACTOR_100P, &load_consumer_,
       base::Bind(&SessionModelAssociator::OnFaviconDataAvailable,
                  AsWeakPtr()));
   load_consumer_.SetClientData(favicon_service, handle, tab_id);
   tab_link->set_favicon_load_handle(handle);
 }
 
 void SessionModelAssociator::OnFaviconDataAvailable(
     FaviconService::Handle handle,
-    history::FaviconData favicon) {
+    const history::FaviconBitmapResult& bitmap_result) {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (!command_line.HasSwitch(switches::kSyncTabFavicons))
     return;
   SessionID::id_type tab_id =
       load_consumer_.GetClientData(
           FaviconServiceFactory::GetForProfile(
               profile_, Profile::EXPLICIT_ACCESS), handle);
   TabLinksMap::iterator iter = tab_map_.find(tab_id);
   if (iter == tab_map_.end()) {
     DVLOG(1) << "Ignoring favicon for closed tab " << tab_id;
     return;
   }
   TabLink* tab_link = iter->second.get();
   DCHECK(tab_link);
   DCHECK(tab_link->url().is_valid());
   // The tab_link holds the current url. Because this load request would have
   // been canceled if the url had changed, we know the url must still be
   // up to date.
 
-  if (favicon.is_valid()) {
+  if (bitmap_result.is_valid()) {
     DCHECK_EQ(handle, tab_link->favicon_load_handle());
     tab_link->set_favicon_load_handle(0);
-    DCHECK_EQ(favicon.icon_type, history::FAVICON);
+    DCHECK_EQ(bitmap_result.icon_type, history::FAVICON);
     DCHECK_NE(tab_link->sync_id(), syncer::kInvalidId);
     // Load the sync tab node and update the favicon data.
     syncer::WriteTransaction trans(FROM_HERE, sync_service_->GetUserShare());
     syncer::WriteNode tab_node(&trans);
     if (tab_node.InitByIdLookup(tab_link->sync_id()) !=
             syncer::BaseNode::INIT_OK) {
       LOG(WARNING) << "Failed to load sync tab node for tab id " << tab_id
                    << " and url " << tab_link->url().spec();
       return;
     }
     sync_pb::SessionSpecifics session_specifics =
         tab_node.GetSessionSpecifics();
     DCHECK(session_specifics.has_tab());
     sync_pb::SessionTab* tab = session_specifics.mutable_tab();
-    if (favicon.image_data->size() > 0) {
+    if (bitmap_result.bitmap_data->size() > 0) {
       DVLOG(1) << "Storing session favicon for "
                << tab_link->url() << " with size "
-               << favicon.image_data->size() << " bytes.";
-      tab->set_favicon(favicon.image_data->front(),
-                       favicon.image_data->size());
+               << bitmap_result.bitmap_data->size() << " bytes.";
+      tab->set_favicon(bitmap_result.bitmap_data->front(),
+                       bitmap_result.bitmap_data->size());
       tab->set_favicon_type(sync_pb::SessionTab::TYPE_WEB_FAVICON);
-      tab->set_favicon_source(favicon.icon_url.spec());
+      tab->set_favicon_source(bitmap_result.icon_url.spec());
     } else {
       LOG(WARNING) << "Null favicon stored for url " << tab_link->url().spec();
     }
     tab_node.SetSessionSpecifics(session_specifics);
   } else {
     // Else the favicon either isn't loaded yet or there is no favicon. We
     // deliberately don't clear the tab_link's favicon_load_handle so we know
     // that we're still waiting for a favicon. ReceivedFavicons(..) below will
     // trigger another favicon load once/if the favicon for the current url
     // becomes available.
@@ skipping 974 matching lines @@
 
 bool SessionModelAssociator::CryptoReadyIfNecessary() {
   // We only access the cryptographer while holding a transaction.
   syncer::ReadTransaction trans(FROM_HERE, sync_service_->GetUserShare());
   const syncer::ModelTypeSet encrypted_types = trans.GetEncryptedTypes();
   return !encrypted_types.Has(SESSIONS) ||
          sync_service_->IsCryptographerReady(&trans);
 }
 
 }  // namespace browser_sync