Rename FaviconBitmapXxx to FaviconRawBitmapXxx

chrome/browser/sync/glue/favicon_cache.cc

 // Copyright 2013 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/sync/glue/favicon_cache.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/favicon/favicon_service.h"
@@ skipping 18 matching lines @@
 // See crbug.com/122890.
 struct SyncedFaviconInfo {
   explicit SyncedFaviconInfo(const GURL& favicon_url)
       : favicon_url(favicon_url),
         is_bookmarked(false),
         received_local_update(false) {}
 
   // The actual favicon data.
   // TODO(zea): don't keep around the actual data for locally sourced
   // favicons (UI can access those directly).
-  favicon_base::FaviconBitmapResult bitmap_data[NUM_SIZES];
+  favicon_base::FaviconRawBitmapResult bitmap_data[NUM_SIZES];
   // The URL this favicon was loaded from.
   const GURL favicon_url;
   // Is the favicon for a bookmarked page?
   bool is_bookmarked;
   // The last time a tab needed this favicon.
   // Note: Do not modify this directly! It should only be modified via
   // UpdateFaviconVisitTime(..).
   base::Time last_visit_time;
   // Whether we've received a local update for this favicon since starting up.
   bool received_local_update;
@@ skipping 62 matching lines @@
 }
 
 // Extract the favicon url from either of the favicon types.
 GURL GetFaviconURLFromSpecifics(const sync_pb::EntitySpecifics& specifics) {
   if (specifics.has_favicon_tracking())
     return GURL(specifics.favicon_tracking().favicon_url());
   else
     return GURL(specifics.favicon_image().favicon_url());
 }
 
-// Convert protobuf image data into a FaviconBitmapResult.
-favicon_base::FaviconBitmapResult GetImageDataFromSpecifics(
+// Convert protobuf image data into a FaviconRawBitmapResult.
+favicon_base::FaviconRawBitmapResult GetImageDataFromSpecifics(
     const sync_pb::FaviconData& favicon_data) {
   base::RefCountedString* temp_string =
       new base::RefCountedString();
   temp_string->data() = favicon_data.favicon();
-  favicon_base::FaviconBitmapResult bitmap_result;
+  favicon_base::FaviconRawBitmapResult bitmap_result;
   bitmap_result.bitmap_data = temp_string;
   bitmap_result.pixel_size.set_height(favicon_data.height());
   bitmap_result.pixel_size.set_width(favicon_data.width());
   return bitmap_result;
 }
 
-// Convert a FaviconBitmapResult into protobuf image data.
+// Convert a FaviconRawBitmapResult into protobuf image data.
 void FillSpecificsWithImageData(
-    const favicon_base::FaviconBitmapResult& bitmap_result,
+    const favicon_base::FaviconRawBitmapResult& bitmap_result,
     sync_pb::FaviconData* favicon_data) {
   if (!bitmap_result.bitmap_data.get())
     return;
   favicon_data->set_height(bitmap_result.pixel_size.height());
   favicon_data->set_width(bitmap_result.pixel_size.width());
   favicon_data->set_favicon(bitmap_result.bitmap_data->front(),
                             bitmap_result.bitmap_data->size());
 }
 
 // Build a FaviconImageSpecifics from a SyncedFaviconInfo.
@@ skipping 15 matching lines @@
     const SyncedFaviconInfo* favicon_info,
     sync_pb::FaviconTrackingSpecifics* tracking_specifics) {
   tracking_specifics->set_favicon_url(favicon_info->favicon_url.spec());
   tracking_specifics->set_last_visit_time_ms(
       syncer::TimeToProtoTime(favicon_info->last_visit_time));
   tracking_specifics->set_is_bookmarked(favicon_info->is_bookmarked);
 }
 
 // Updates |favicon_info| with the image data in |bitmap_result|.
 bool UpdateFaviconFromBitmapResult(
-    const favicon_base::FaviconBitmapResult& bitmap_result,
+    const favicon_base::FaviconRawBitmapResult& bitmap_result,
     SyncedFaviconInfo* favicon_info) {
   DCHECK_EQ(favicon_info->favicon_url, bitmap_result.icon_url);
   if (!bitmap_result.is_valid()) {
     DVLOG(1) << "Received invalid favicon at " << bitmap_result.icon_url.spec();
     return false;
   }
 
   IconSize icon_size = GetIconSizeBinFromBitmapResult(
       bitmap_result.pixel_size);
   if (icon_size == SIZE_INVALID) {
@@ skipping 250 matching lines @@
     page_task_map_[page_url] = 0;  // For testing only.
     return;
   }
   FaviconService* favicon_service =
       FaviconServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
   if (!favicon_service)
     return;
   // TODO(zea): This appears to only fetch one favicon (best match based on
   // desired_size_in_dip). Figure out a way to fetch all favicons we support.
   // See crbug.com/181068.
-  base::CancelableTaskTracker::TaskId id = favicon_service->GetFaviconForURL(
-      FaviconService::FaviconForURLParams(
-          page_url, SupportedFaviconTypes(), kMaxFaviconResolution),
-      base::Bind(&FaviconCache::OnFaviconDataAvailable,
-                 weak_ptr_factory_.GetWeakPtr(),
-                 page_url),
-      &cancelable_task_tracker_);
+  base::CancelableTaskTracker::TaskId id =
+      favicon_service->GetFaviconForPageURL(
+          FaviconService::FaviconForPageURLParams(
+              page_url, SupportedFaviconTypes(), kMaxFaviconResolution),
+          base::Bind(&FaviconCache::OnFaviconDataAvailable,
+                     weak_ptr_factory_.GetWeakPtr(),
+                     page_url),
+          &cancelable_task_tracker_);
   page_task_map_[page_url] = id;
 }
 
 void FaviconCache::OnFaviconVisited(const GURL& page_url,
                                     const GURL& favicon_url) {
   DCHECK(page_url.is_valid());
   if (!favicon_url.is_valid() ||
       synced_favicons_.find(favicon_url) == synced_favicons_.end()) {
     // TODO(zea): consider triggering a favicon load if we have some but not
     // all desired resolutions?
@@ skipping 149 matching lines @@
   // TODO(zea): incorporate bookmarked status here once we care about it.
   if (lhs->last_visit_time < rhs->last_visit_time)
     return true;
   else if (lhs->last_visit_time == rhs->last_visit_time)
     return lhs->favicon_url.spec() < rhs->favicon_url.spec();
   return false;
 }
 
 void FaviconCache::OnFaviconDataAvailable(
     const GURL& page_url,
-    const std::vector<favicon_base::FaviconBitmapResult>& bitmap_results) {
+    const std::vector<favicon_base::FaviconRawBitmapResult>& bitmap_results) {
   PageTaskMap::iterator page_iter = page_task_map_.find(page_url);
   if (page_iter == page_task_map_.end())
     return;
   page_task_map_.erase(page_iter);
 
   if (bitmap_results.size() == 0) {
     // Either the favicon isn't loaded yet or there is no valid favicon.
     // We already cleared the task id, so just return.
     DVLOG(1) << "Favicon load failed for page " << page_url.spec();
     return;
   }
 
   base::Time now = base::Time::Now();
   std::map<GURL, LocalFaviconUpdateInfo> favicon_updates;
   for (size_t i = 0; i < bitmap_results.size(); ++i) {
-    const favicon_base::FaviconBitmapResult& bitmap_result = bitmap_results[i];
+    const favicon_base::FaviconRawBitmapResult& bitmap_result =
+        bitmap_results[i];
     GURL favicon_url = bitmap_result.icon_url;
     if (!favicon_url.is_valid() || favicon_url.SchemeIs("data"))
       continue;  // Can happen if the page is still loading.
 
     SyncedFaviconInfo* favicon_info = GetFaviconInfo(favicon_url);
     if (!favicon_info)
       return;  // We reached the in-memory limit.
 
     favicon_updates[favicon_url].new_image |=
         !FaviconInfoHasImages(*favicon_info);
@@ skipping 385 matching lines @@
        !FaviconInfoHasTracking(*favicon_iter->second))) {
     DropSyncedFavicon(favicon_iter);
     return;
   }
 
   if (type == syncer::FAVICON_IMAGES) {
     DVLOG(1) << "Dropping favicon image "
              << favicon_iter->second.get()->favicon_url;
     for (int i = 0; i < NUM_SIZES; ++i) {
       favicon_iter->second->bitmap_data[i] =
-          favicon_base::FaviconBitmapResult();
+          favicon_base::FaviconRawBitmapResult();
     }
     DCHECK(!FaviconInfoHasImages(*favicon_iter->second));
   } else {
     DCHECK_EQ(type, syncer::FAVICON_TRACKING);
     DVLOG(1) << "Dropping favicon tracking "
              << favicon_iter->second.get()->favicon_url;
     recent_favicons_.erase(favicon_iter->second);
     favicon_iter->second->last_visit_time = base::Time();
     favicon_iter->second->is_bookmarked = false;
     recent_favicons_.insert(favicon_iter->second);
     DCHECK(!FaviconInfoHasTracking(*favicon_iter->second));
   }
 }
 
 size_t FaviconCache::NumFaviconsForTest() const {
   return synced_favicons_.size();
 }
 
 size_t FaviconCache::NumTasksForTest() const {
   return page_task_map_.size();
 }
 
 }  // namespace browser_sync