Cleanup history favicon code

chrome/browser/favicon/favicon_service.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_FAVICON_FAVICON_SERVICE_H_
 #define CHROME_BROWSER_FAVICON_FAVICON_SERVICE_H_
 
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 59 matching lines @@
       FaviconRawCallback;
 
   // Callback for GetFavicon() and GetFaviconForURL().
   //
   // The first argument is the set of bitmaps for the passed in URL and
   // icon types whose pixel sizes best match the passed in
   // |desired_size_in_dip| at the scale factors supported by the current
   // platform (eg MacOS) in addition to 1x. The vector has at most one result
   // for each of the scale factors. There are less entries if a single result
   // is the best bitmap to use for several scale factors.
-  //
-  // Second argument:
-  // a) If the callback is called as a result of GetFaviconForURL():
-  //    The second argument is a map of the icon URLs mapped to |page_url| to
-  //    the sizes at which the favicon is available from the web.
-  // b) If the callback is called as a result of GetFavicon() or
-  //    UpdateFaviconMappingsAndFetch():
-  //    The second argument is a map of the subset of |icon_urls| known to the
-  //    history backend to a vector of sizes of the favicon bitmaps at each
-  //    URL. If none of |icon_urls| are known to the history backend, an empty
-  //    map is returned.
-  // See history_types.h for more information about IconURLSizesMap.
-  typedef base::Callback<
-      void(const std::vector<history::FaviconBitmapResult>&,
-           const history::IconURLSizesMap&)>
+  typedef base::Callback<void(const std::vector<history::FaviconBitmapResult>&)>
       FaviconResultsCallback;
 
   // We usually pass parameters with pointer to avoid copy. This function is a
   // helper to run FaviconResultsCallback with pointer parameters.
   static void FaviconResultsCallbackRunner(
       const FaviconResultsCallback& callback,
-      const std::vector<history::FaviconBitmapResult>* results,
-      const history::IconURLSizesMap* size_map);
+      const std::vector<history::FaviconBitmapResult>* results);
 
   // Requests the favicon at |icon_url| of |icon_type| whose size most closely
   // matches |desired_size_in_dip|. If |desired_size_in_dip| is 0, the largest
   // favicon bitmap at |icon_url| is returned. |consumer| is notified when the
   // bits have been fetched. |icon_url| is the URL of the icon itself, e.g.
   // <http://www.google.com/favicon.ico>.
   // Each of the three methods below differs in the format of the callback and
   // the requested scale factors. All of the scale factors supported by the
   // current platform (eg MacOS) are requested for GetFaviconImage().
   CancelableTaskTracker::TaskId GetFaviconImage(
@@ skipping 136 matching lines @@
       const FaviconResultsCallback& callback,
       CancelableTaskTracker* tracker);
 
   // Intermediate callback for GetFaviconImage() and GetFaviconImageForURL()
   // so that history service can deal solely with FaviconResultsCallback.
   // Builds history::FaviconImageResult from |favicon_bitmap_results| and runs
   // |callback|.
   void RunFaviconImageCallbackWithBitmapResults(
       const FaviconImageCallback& callback,
       int desired_size_in_dip,
-      const std::vector<history::FaviconBitmapResult>& favicon_bitmap_results,
-      const history::IconURLSizesMap& icon_url_sizes_map);
+      const std::vector<history::FaviconBitmapResult>& favicon_bitmap_results);
 
   // Intermediate callback for GetRawFavicon() and GetRawFaviconForURL()
   // so that history service can deal solely with FaviconResultsCallback.
   // Resizes history::FaviconBitmapResult if necessary and runs |callback|.
   void RunFaviconRawCallbackWithBitmapResults(
       const FaviconRawCallback& callback,
       int desired_size_in_dip,
       ui::ScaleFactor desired_scale_factor,
-      const std::vector<history::FaviconBitmapResult>& favicon_bitmap_results,
-      const history::IconURLSizesMap& icon_url_sizes_map);
+      const std::vector<history::FaviconBitmapResult>& favicon_bitmap_results);
 
   DISALLOW_COPY_AND_ASSIGN(FaviconService);
 };
 
 #endif  // CHROME_BROWSER_FAVICON_FAVICON_SERVICE_H_