Index: chrome/browser/sync/glue/favicon_cache.cc |
diff --git a/chrome/browser/sync/glue/favicon_cache.cc b/chrome/browser/sync/glue/favicon_cache.cc |
index 3193791786faee63f4f6f3f598510f72b4e50765..4111f3222f8f31cb94273d5fbd1023097496c3dd 100644 |
--- a/chrome/browser/sync/glue/favicon_cache.cc |
+++ b/chrome/browser/sync/glue/favicon_cache.cc |
@@ -138,7 +138,7 @@ chrome::FaviconBitmapResult GetImageDataFromSpecifics( |
void FillSpecificsWithImageData( |
const chrome::FaviconBitmapResult& bitmap_result, |
sync_pb::FaviconData* favicon_data) { |
- if (!bitmap_result.bitmap_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()); |
@@ -500,7 +500,7 @@ bool FaviconCache::GetSyncedFaviconForFaviconURL( |
return false; |
// TODO(zea): support getting other resolutions. |
- if (!iter->second->bitmap_data[SIZE_16].bitmap_data) |
+ if (!iter->second->bitmap_data[SIZE_16].bitmap_data.get()) |
return false; |
*favicon_png = iter->second->bitmap_data[SIZE_16].bitmap_data; |
@@ -844,19 +844,19 @@ void FaviconCache::MergeSyncFavicon(const syncer::SyncData& sync_favicon, |
if (image_specifics.has_favicon_web()) { |
favicon_info->bitmap_data[SIZE_16] = GetImageDataFromSpecifics( |
image_specifics.favicon_web()); |
- } else if (favicon_info->bitmap_data[SIZE_16].bitmap_data) { |
+ } else if (favicon_info->bitmap_data[SIZE_16].bitmap_data.get()) { |
needs_update = true; |
} |
if (image_specifics.has_favicon_web_32()) { |
favicon_info->bitmap_data[SIZE_32] = GetImageDataFromSpecifics( |
image_specifics.favicon_web_32()); |
- } else if (favicon_info->bitmap_data[SIZE_32].bitmap_data) { |
+ } else if (favicon_info->bitmap_data[SIZE_32].bitmap_data.get()) { |
needs_update = true; |
} |
if (image_specifics.has_favicon_touch_64()) { |
favicon_info->bitmap_data[SIZE_64] = GetImageDataFromSpecifics( |
image_specifics.favicon_touch_64()); |
- } else if (favicon_info->bitmap_data[SIZE_64].bitmap_data) { |
+ } else if (favicon_info->bitmap_data[SIZE_64].bitmap_data.get()) { |
needs_update = true; |
} |