Cleanup FaviconSQLHandler::Update

chrome/browser/history/thumbnail_database.h

 // 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.
 
 #ifndef CHROME_BROWSER_HISTORY_THUMBNAIL_DATABASE_H_
 #define CHROME_BROWSER_HISTORY_THUMBNAIL_DATABASE_H_
 
 #include <vector>
 
 #include "base/gtest_prod_util.h"
@@ skipping 131 matching lines @@
   FaviconID GetFaviconIDForFaviconURL(const GURL& icon_url,
                                       int required_icon_type,
                                       IconType* icon_type);
 
   // Gets the icon_url, icon_type and sizes for the specified |icon_id|.
   bool GetFaviconHeader(FaviconID icon_id,
                         GURL* icon_url,
                         IconType* icon_type,
                         FaviconSizes* favicon_sizes);
 
-  // Adds favicon with |icon_url| and |icon_type| to the favicon db, returning
-  // its id.
-  FaviconID AddFavicon(const GURL& icon_url, IconType icon_type);
+  // Adds favicon with |icon_url|, |icon_type| and |favicon_sizes| to the
+  // favicon db, returning its id.
+  FaviconID AddFavicon(const GURL& icon_url,
+                       IconType icon_type,
+                       const FaviconSizes& favicon_sizes);
 
   // Adds a favicon with a single bitmap. This call is equivalent to calling
-  // AddFavicon, SetFaviconSizes, and AddFaviconBitmap.
+  // AddFavicon and AddFaviconBitmap.
   FaviconID AddFavicon(const GURL& icon_url,
                        IconType icon_type,
                        const FaviconSizes& favicon_sizes,
                        const scoped_refptr<base::RefCountedMemory>& icon_data,
                        base::Time time,
                        const gfx::Size& pixel_size);
 
   // Delete the favicon with the provided id. Returns false on failure
   bool DeleteFavicon(FaviconID id);
 
@@ skipping 27 matching lines @@
 
   // Updates the page and icon mapping for the given mapping_id with the given
   // icon_id.
   // Returns true if the update succeeded.
   bool UpdateIconMapping(IconMappingID mapping_id, FaviconID icon_id);
 
   // Deletes the icon mapping entries for the given page url.
   // Returns true if the deletion succeeded.
   bool DeleteIconMappings(const GURL& page_url);
 
+  // Deletes the icon mapping with |mapping_id|.
+  // Returns true if the deletion succeeded.
+  bool DeleteIconMapping(IconMappingID mapping_id);
+
   // Checks whether a favicon is used by any URLs in the database.
   bool HasMappingFor(FaviconID id);
 
   // Clones the existing mappings from |old_page_url| if |new_page_url| has no
   // mappings. Otherwise, will leave mappings alone.
   bool CloneIconMappings(const GURL& old_page_url, const GURL& new_page_url);
 
   // The class to enumerate icon mappings. Use InitIconMappingEnumerator to
   // initialize.
   class IconMappingEnumerator {
@@ skipping 164 matching lines @@
   const HistoryPublisher* history_publisher_;
 
   // True if migration to TopSites has been done and the thumbnails
   // table should not be used.
   bool use_top_sites_;
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_THUMBNAIL_DATABASE_H_