Fix HistoryBackend::SetFavicons

chrome/browser/history/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 "chrome/browser/history/history_backend.h"
 
 #include <list>
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 1881 matching lines @@
     return;
 
   FaviconData favicon;
 
   if (thumbnail_db_.get()) {
     const FaviconID favicon_id =
         thumbnail_db_->GetFaviconIDForFaviconURL(
             icon_url, icon_types, &favicon.icon_type);
     if (favicon_id) {
       scoped_refptr<base::RefCountedMemory> data;
-      favicon.known_icon = true;
       Time last_updated;
       if (thumbnail_db_->GetFavicon(favicon_id, &last_updated, &data,
                                     NULL, NULL)) {
+        favicon.known_icon = true;
         favicon.expired = (Time::Now() - last_updated) >
             TimeDelta::FromDays(kFaviconRefetchDays);
         favicon.image_data = data;
       }
 
       if (page_url)
         SetFaviconMapping(*page_url, favicon_id, favicon.icon_type);
     }
     // else case, haven't cached entry yet. Caller is responsible for
     // downloading the favicon and invoking SetFavicon.
@@ skipping 30 matching lines @@
     const GURL& page_url,
     const GURL& icon_url,
     scoped_refptr<base::RefCountedMemory> data,
     IconType icon_type) {
   DCHECK(data.get());
   if (!thumbnail_db_.get() || !db_.get())
     return;
 
   FaviconID id = thumbnail_db_->GetFaviconIDForFaviconURL(
       icon_url, icon_type, NULL);
-  if (id)
+  if (!id) {
+    id = thumbnail_db_->AddFavicon(icon_url,
+                                   icon_type,
+                                   "0 0",
+                                   data,
+                                   Time::Now(),
+                                   gfx::Size());
+  } else {
     thumbnail_db_->DeleteFaviconBitmapsForFavicon(id);
-
-  id = thumbnail_db_->AddFavicon(icon_url,
-                                 icon_type,
-                                 "0 0",
-                                 data,
-                                 Time::Now(),
-                                 gfx::Size());
+    thumbnail_db_->AddFaviconBitmap(id, data, Time::Now(), gfx::Size());
+  }
 
   SetFaviconMapping(page_url, id, icon_type);
 }
 
 void HistoryBackend::SetFaviconMapping(const GURL& page_url,
                                        FaviconID id,
                                        IconType icon_type) {
   if (!thumbnail_db_.get())
     return;
 
@@ skipping 513 matching lines @@
   info.url_id = visit.url_id;
   info.time = visit.visit_time;
   info.transition = visit.transition;
   // If we don't have a delegate yet during setup or shutdown, we will drop
   // these notifications.
   if (delegate_.get())
     delegate_->NotifyVisitDBObserversOnAddVisit(info);
 }
 
 }  // namespace history