Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Unified Diff: chrome/browser/sync/glue/favicon_cache_unittest.cc

Issue 330603004: Rename FaviconBitmapXxx to FaviconRawBitmapXxx (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix android Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/glue/favicon_cache.cc ('k') | chrome/browser/sync/test/integration/bookmarks_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « chrome/browser/sync/glue/favicon_cache.cc ('k') | chrome/browser/sync/test/integration/bookmarks_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698