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

chrome/browser/history/history_backend.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_HISTORY_BACKEND_H_
 #define CHROME_BROWSER_HISTORY_HISTORY_BACKEND_H_
 
 #include <string>
 #include <utility>
 
@@ skipping 633 matching lines @@
   bool ClearAllMainHistory(const URLRows& kept_urls);
 
   // Returns the BookmarkService, blocking until it is loaded. This may return
   // NULL during testing.
   BookmarkService* GetBookmarkService();
 
   // If there is a favicon for |page_url| and one of the types in |icon_types|,
   // |favicon| is set appropriately and true is returned.
   bool GetFaviconFromDB(const GURL& page_url,
                         int icon_types,
-                        FaviconData* favicon);
+                        FaviconData* favicon_data);
 
   // Get favicon by the given |favicon_id|, the |favicon| is set appropriately
   // and true if returned on success, otherwise false is returned.
-  bool GetFaviconFromDB(FaviconID favicon_id, FaviconData* favicon);
+  bool GetFaviconFromDB(FaviconID favicon_id, FaviconData* favicon_data);
 
   // Notify any observers of an addition to the visit database.
   void NotifyVisitObservers(const VisitRow& visit);
 
   // Data ----------------------------------------------------------------------
 
   // Delegate. See the class definition above for more information. This will
   // be NULL before Init is called and after Cleanup, but is guaranteed
   // non-NULL in between.
   scoped_ptr<Delegate> delegate_;
@@ skipping 86 matching lines @@
   // Used to provide the Android ContentProvider APIs.
   scoped_ptr<AndroidProviderBackend> android_provider_backend_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(HistoryBackend);
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_HISTORY_BACKEND_H_