chrome/browser/history/history_backend_unittest.cc - Issue 10870022: Change FaviconData to be able to return data for multiple bitmaps for 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/history_backend_unittest.cc

Issue 10870022: Change FaviconData to be able to return data for multiple bitmaps for 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

« chrome/browser/history/history_backend.cc ('K') | « chrome/browser/history/history_backend.cc ('k') | chrome/browser/history/history_types.h » ('j') | chrome/browser/history/history_types.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/history/history_backend_unittest.cc

diff --git a/chrome/browser/history/history_backend_unittest.cc b/chrome/browser/history/history_backend_unittest.cc

index 35b4fd9965432a8ca93f1f210edb64b9ee01e71a..1c885a69ff8445723d1330525d3e5e9673f94fe9 100644

--- a/chrome/browser/history/history_backend_unittest.cc

+++ b/chrome/browser/history/history_backend_unittest.cc

@@ -1234,8 +1234,8 @@ TEST_F(HistoryBackendTest, GetFaviconForURL) {

FaviconData favicon;

ASSERT_TRUE(backend_->GetFaviconFromDB(url, FAVICON, &favicon));

std::string favicon_data(

- favicon.image_data->front(),

- favicon.image_data->front() + favicon.image_data->size());

+ favicon.first_bitmap()->front(),

+ favicon.first_bitmap()->front() + favicon.first_bitmap()->size());

EXPECT_EQ(FAVICON, favicon.icon_type);

EXPECT_EQ(icon_url, favicon.icon_url);

@@ -1244,8 +1244,8 @@ TEST_F(HistoryBackendTest, GetFaviconForURL) {

// Test the touch icon for this URL.

ASSERT_TRUE(backend_->GetFaviconFromDB(url, TOUCH_ICON, &favicon));

std::string touchicon_data(

- favicon.image_data->front(),

- favicon.image_data->front() + favicon.image_data->size());

+ favicon.first_bitmap()->front(),

+ favicon.first_bitmap()->front() + favicon.first_bitmap()->size());

EXPECT_EQ(TOUCH_ICON, favicon.icon_type);

EXPECT_EQ(icon_url, favicon.icon_url);