| Index: chrome/browser/sync/glue/favicon_cache_unittest.cc
|
| diff --git a/chrome/browser/sync/glue/favicon_cache_unittest.cc b/chrome/browser/sync/glue/favicon_cache_unittest.cc
|
| index b0af7e306c75c41f43b239c35347f115237c972c..d96efb1c8911347a3c45bd0d415b1b5243b89737 100644
|
| --- a/chrome/browser/sync/glue/favicon_cache_unittest.cc
|
| +++ b/chrome/browser/sync/glue/favicon_cache_unittest.cc
|
| @@ -411,9 +411,9 @@ scoped_ptr<syncer::SyncErrorFactory> SyncFaviconCacheTest::
|
|
|
| void SyncFaviconCacheTest::OnCustomFaviconDataAvailable(
|
| const TestFaviconData& test_data) {
|
| - std::vector<favicon_base::FaviconBitmapResult> bitmap_results;
|
| + std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results;
|
| if (!test_data.image_16.empty()) {
|
| - favicon_base::FaviconBitmapResult bitmap_result;
|
| + favicon_base::FaviconRawBitmapResult bitmap_result;
|
| bitmap_result.icon_url = test_data.icon_url;
|
| bitmap_result.pixel_size.set_width(16);
|
| bitmap_result.pixel_size.set_height(16);
|
| @@ -423,7 +423,7 @@ void SyncFaviconCacheTest::OnCustomFaviconDataAvailable(
|
| bitmap_results.push_back(bitmap_result);
|
| }
|
| if (!test_data.image_32.empty()) {
|
| - favicon_base::FaviconBitmapResult bitmap_result;
|
| + favicon_base::FaviconRawBitmapResult bitmap_result;
|
| bitmap_result.icon_url = test_data.icon_url;
|
| bitmap_result.pixel_size.set_width(32);
|
| bitmap_result.pixel_size.set_height(32);
|
| @@ -433,7 +433,7 @@ void SyncFaviconCacheTest::OnCustomFaviconDataAvailable(
|
| bitmap_results.push_back(bitmap_result);
|
| }
|
| if (!test_data.image_64.empty()) {
|
| - favicon_base::FaviconBitmapResult bitmap_result;
|
| + favicon_base::FaviconRawBitmapResult bitmap_result;
|
| bitmap_result.icon_url = test_data.icon_url;
|
| bitmap_result.pixel_size.set_width(64);
|
| bitmap_result.pixel_size.set_height(64);
|
|
|