chrome/browser/history/android/android_provider_backend_unittest.cc - Issue 10815068: Changes favicon database to support storing bitmaps of different sizes for the same icon_url

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/history/android/android_provider_backend_unittest.cc

Issue 10815068: Changes favicon database to support storing bitmaps of different sizes for the same icon_url (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 4 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/history/android/android_provider_backend.cc ('k') | chrome/browser/history/android/favicon_sql_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/history/android/android_provider_backend_unittest.cc

diff --git a/chrome/browser/history/android/android_provider_backend_unittest.cc b/chrome/browser/history/android/android_provider_backend_unittest.cc

index 31a84620498684387a3db5916ee3bea32a08d3de..45ce3e94f5c7c5b4e901807bdbe54ab14c4b302a 100644

--- a/chrome/browser/history/android/android_provider_backend_unittest.cc

+++ b/chrome/browser/history/android/android_provider_backend_unittest.cc

@@ -1155,10 +1155,13 @@ TEST_F(AndroidProviderBackendTest, UpdateFavicon) {

EXPECT_TRUE(thumbnail_db_.GetIconMappingForPageURL(row1.url(), FAVICON,

&icon_mapping));

Time last_updated;

- std::vector<unsigned char> png_icon_data;

+ scoped_refptr<base::RefCountedMemory> png_icon_data;

EXPECT_TRUE(thumbnail_db_.GetFavicon(icon_mapping.icon_id, &last_updated,

&png_icon_data, NULL, NULL));

- EXPECT_EQ(data, png_icon_data);

+ std::string png_icon_data_as_string(png_icon_data->front(),

+ png_icon_data->front() + png_icon_data->size());

+ EXPECT_EQ(1u, png_icon_data_as_string.size());

+ EXPECT_EQ('1', png_icon_data_as_string[0]);

// Remove favicon.

HistoryAndBookmarkRow update_row2;