Rename FaviconBitmapXxx to FaviconRawBitmapXxx

chrome/browser/favicon/favicon_handler.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_HANDLER_H_
 #define CHROME_BROWSER_FAVICON_FAVICON_HANDLER_H_
 
 #include <deque>
 #include <map>
 #include <vector>
@@ skipping 173 matching lines @@
 
     GURL url;
     GURL image_url;
     gfx::Image image;
     float score;
     favicon_base::IconType icon_type;
   };
 
   // See description above class for details.
   void OnFaviconDataForInitialURLFromFaviconService(const std::vector<
-      favicon_base::FaviconBitmapResult>& favicon_bitmap_results);
+      favicon_base::FaviconRawBitmapResult>& favicon_bitmap_results);
 
   // If the favicon has expired, asks the renderer to download the favicon.
   // Otherwise asks history to update the mapping between page url and icon
   // url with a callback to OnFaviconData when done.
   void DownloadFaviconOrAskFaviconService(const GURL& page_url,
                                           const GURL& icon_url,
                                           favicon_base::IconType icon_type);
 
   // See description above class for details.
-  void OnFaviconData(const std::vector<favicon_base::FaviconBitmapResult>&
+  void OnFaviconData(const std::vector<favicon_base::FaviconRawBitmapResult>&
                          favicon_bitmap_results);
 
   // Schedules a download for the specified entry. This adds the request to
   // download_requests_.
   int ScheduleDownload(const GURL& url,
                        const GURL& image_url,
                        favicon_base::IconType icon_type);
 
   // Updates |favicon_candidate_| and returns true if it is an exact match.
   bool UpdateFaviconCandidate(const GURL& url,
                               const GURL& image_url,
                               const gfx::Image& image,
                               float score,
                               favicon_base::IconType icon_type);
 
   // Sets the image data for the favicon.
   void SetFavicon(const GURL& url,
                   const GURL& icon_url,
                   const gfx::Image& image,
                   favicon_base::IconType icon_type);
 
   // Sets the favicon's data.
   void SetFaviconOnActivePage(const std::vector<
-      favicon_base::FaviconBitmapResult>& favicon_bitmap_results);
+      favicon_base::FaviconRawBitmapResult>& favicon_bitmap_results);
   void SetFaviconOnActivePage(const GURL& icon_url, const gfx::Image& image);
 
   // Return the current candidate if any.
   favicon::FaviconURL* current_candidate() {
     return (!image_urls_.empty()) ? &image_urls_.front() : NULL;
   }
 
   // Returns whether the page's url changed since the favicon was requested.
   bool PageChangedSinceFaviconWasRequested();
 
@@ skipping 31 matching lines @@
 
   // The combination of the supported icon types.
   const int icon_types_;
 
   // Whether the largest icon should be downloaded.
   const bool download_largest_icon_;
 
   // The prioritized favicon candidates from the page back from the renderer.
   std::vector<favicon::FaviconURL> image_urls_;
 
-  // The FaviconBitmapResults from history.
-  std::vector<favicon_base::FaviconBitmapResult> history_results_;
+  // The FaviconRawBitmapResults from history.
+  std::vector<favicon_base::FaviconRawBitmapResult> history_results_;
 
   // The client which implements embedder-specific Favicon operations.
   FaviconClient* client_;  // weak
 
   // This handler's driver.
   FaviconDriver* driver_;  // weak
 
   // Best image we've seen so far.  As images are downloaded from the page they
   // are stored here. When there is an exact match, or no more images are
   // available the favicon service and the current page are updated (assuming
   // the image is for a favicon).
   FaviconCandidate best_favicon_candidate_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconHandler);
 };
 
 #endif  // CHROME_BROWSER_FAVICON_FAVICON_HANDLER_H_