chrome/browser/history/history_backend_unittest.cc - Issue 330603004: Rename FaviconBitmapXxx to FaviconRawBitmapXxx

Unified Diff: chrome/browser/history/history_backend_unittest.cc

Issue 330603004: Rename FaviconBitmapXxx to FaviconRawBitmapXxx (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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/history/history_backend.cc ('k') | chrome/browser/history/history_service.h » ('j') | components/favicon_base/select_favicon_frames.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 1580806cd02ed542e50028f9e0d32dbac71f1492..8c1d741d78b12f2280eb8f7bf4b4b44ce289c991 100644

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

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

@@ -53,14 +53,14 @@ static const gfx::Size kSmallSize = gfx::Size(16, 16);

static const gfx::Size kLargeSize = gfx::Size(32, 32);

// Comparison functions as to make it easier to check results of

-// GetFaviconBitmaps() and GetIconMappingsForPageURL().

+// GetFaviconRawBitmaps() and GetIconMappingsForPageURL().

bool IconMappingLessThan(const history::IconMapping& a,

const history::IconMapping& b) {

return a.icon_url < b.icon_url;

}

-bool FaviconBitmapLessThan(const history::FaviconBitmap& a,

- const history::FaviconBitmap& b) {

+bool FaviconRawBitmapLessThan(const history::FaviconRawBitmap& a,

+ const history::FaviconRawBitmap& b) {

return a.pixel_size.GetArea() < b.pixel_size.GetArea();

}

@@ -360,21 +360,25 @@ class HistoryBackendTest : public HistoryBackendTestBase {

// Returns the favicon bitmaps for |icon_id| sorted by pixel size in

// ascending order. Returns true if there is at least one favicon bitmap.

- bool GetSortedFaviconBitmaps(favicon_base::FaviconID icon_id,

- std::vector<FaviconBitmap>* favicon_bitmaps) {

- if (!backend_->thumbnail_db_->GetFaviconBitmaps(icon_id, favicon_bitmaps))

+ bool GetSortedFaviconRawBitmaps(

+ favicon_base::FaviconID icon_id,

+ std::vector<FaviconRawBitmap>* favicon_bitmaps) {

+ if (!backend_->thumbnail_db_->GetFaviconRawBitmaps(icon_id,

+ favicon_bitmaps))

return false;

- std::sort(favicon_bitmaps->begin(), favicon_bitmaps->end(),

- FaviconBitmapLessThan);

+ std::sort(favicon_bitmaps->begin(),

+ favicon_bitmaps->end(),

+ FaviconRawBitmapLessThan);

return true;

}

// Returns true if there is exactly one favicon bitmap associated to

// |favicon_id|. If true, returns favicon bitmap in output parameter.

- bool GetOnlyFaviconBitmap(const favicon_base::FaviconID icon_id,

- FaviconBitmap* favicon_bitmap) {

- std::vector<FaviconBitmap> favicon_bitmaps;

- if (!backend_->thumbnail_db_->GetFaviconBitmaps(icon_id, &favicon_bitmaps))

+ bool GetOnlyFaviconRawBitmap(const favicon_base::FaviconID icon_id,

+ FaviconRawBitmap* favicon_bitmap) {

+ std::vector<FaviconRawBitmap> favicon_bitmaps;

+ if (!backend_->thumbnail_db_->GetFaviconRawBitmaps(icon_id,

+ &favicon_bitmaps))

return false;

if (favicon_bitmaps.size() != 1)

return false;

@@ -385,27 +389,30 @@ class HistoryBackendTest : public HistoryBackendTestBase {

// Generates |favicon_bitmap_data| with entries for the icon_urls and sizes

// specified. The bitmap_data for entries are lowercase letters of the

// alphabet starting at 'a' for the entry at index 0.

- void GenerateFaviconBitmapData(

+ void GenerateFaviconRawBitmapData(

const GURL& icon_url1,

const std::vector<gfx::Size>& icon_url1_sizes,

- std::vector<favicon_base::FaviconBitmapData>* favicon_bitmap_data) {

- GenerateFaviconBitmapData(icon_url1, icon_url1_sizes, GURL(),

- std::vector<gfx::Size>(), favicon_bitmap_data);

+ std::vector<favicon_base::FaviconRawBitmapData>* favicon_bitmap_data) {

+ GenerateFaviconRawBitmapData(icon_url1,

+ icon_url1_sizes,

+ GURL(),

+ std::vector<gfx::Size>(),

+ favicon_bitmap_data);

}

- void GenerateFaviconBitmapData(

+ void GenerateFaviconRawBitmapData(

const GURL& icon_url1,

const std::vector<gfx::Size>& icon_url1_sizes,

const GURL& icon_url2,

const std::vector<gfx::Size>& icon_url2_sizes,

- std::vector<favicon_base::FaviconBitmapData>* favicon_bitmap_data) {

+ std::vector<favicon_base::FaviconRawBitmapData>* favicon_bitmap_data) {

favicon_bitmap_data->clear();

char bitmap_char = 'a';

for (size_t i = 0; i < icon_url1_sizes.size(); ++i) {

std::vector<unsigned char> data;

data.push_back(bitmap_char);

- favicon_base::FaviconBitmapData bitmap_data_element;

+ favicon_base::FaviconRawBitmapData bitmap_data_element;

bitmap_data_element.bitmap_data =

base::RefCountedBytes::TakeVector(&data);

bitmap_data_element.pixel_size = icon_url1_sizes[i];

@@ -418,7 +425,7 @@ class HistoryBackendTest : public HistoryBackendTestBase {

for (size_t i = 0; i < icon_url2_sizes.size(); ++i) {

std::vector<unsigned char> data;

data.push_back(bitmap_char);

- favicon_base::FaviconBitmapData bitmap_data_element;

+ favicon_base::FaviconRawBitmapData bitmap_data_element;

bitmap_data_element.bitmap_data =

base::RefCountedBytes::TakeVector(&data);

bitmap_data_element.pixel_size = icon_url2_sizes[i];

@@ -561,18 +568,18 @@ TEST_F(HistoryBackendTest, DeleteAll) {

std::vector<unsigned char> data;

data.push_back('a');

- EXPECT_TRUE(backend_->thumbnail_db_->AddFaviconBitmap(favicon1,

- new base::RefCountedBytes(data), Time::Now(), kSmallSize));

+ EXPECT_TRUE(backend_->thumbnail_db_->AddFaviconRawBitmap(

+ favicon1, new base::RefCountedBytes(data), Time::Now(), kSmallSize));

data[0] = 'b';

- EXPECT_TRUE(backend_->thumbnail_db_->AddFaviconBitmap(favicon1,

- new base::RefCountedBytes(data), Time::Now(), kLargeSize));

+ EXPECT_TRUE(backend_->thumbnail_db_->AddFaviconRawBitmap(

+ favicon1, new base::RefCountedBytes(data), Time::Now(), kLargeSize));

data[0] = 'c';

- EXPECT_TRUE(backend_->thumbnail_db_->AddFaviconBitmap(favicon2,

- new base::RefCountedBytes(data), Time::Now(), kSmallSize));

+ EXPECT_TRUE(backend_->thumbnail_db_->AddFaviconRawBitmap(

+ favicon2, new base::RefCountedBytes(data), Time::Now(), kSmallSize));

data[0] = 'd';

- EXPECT_TRUE(backend_->thumbnail_db_->AddFaviconBitmap(favicon2,

- new base::RefCountedBytes(data), Time::Now(), kLargeSize));

+ EXPECT_TRUE(backend_->thumbnail_db_->AddFaviconRawBitmap(

+ favicon2, new base::RefCountedBytes(data), Time::Now(), kLargeSize));

// First visit two URLs.

URLRow row1(GURL("http://www.google.com/"));

@@ -639,17 +646,17 @@ TEST_F(HistoryBackendTest, DeleteAll) {

favicon_url1, favicon_base::FAVICON, NULL);

EXPECT_TRUE(out_favicon1);

- std::vector<FaviconBitmap> favicon_bitmaps;

- EXPECT_TRUE(backend_->thumbnail_db_->GetFaviconBitmaps(

- out_favicon1, &favicon_bitmaps));

+ std::vector<FaviconRawBitmap> favicon_bitmaps;

+ EXPECT_TRUE(backend_->thumbnail_db_->GetFaviconRawBitmaps(out_favicon1,

+ &favicon_bitmaps));

ASSERT_EQ(2u, favicon_bitmaps.size());

- FaviconBitmap favicon_bitmap1 = favicon_bitmaps[0];

- FaviconBitmap favicon_bitmap2 = favicon_bitmaps[1];

+ FaviconRawBitmap favicon_bitmap1 = favicon_bitmaps[0];

+ FaviconRawBitmap favicon_bitmap2 = favicon_bitmaps[1];

// Favicon bitmaps do not need to be in particular order.

if (favicon_bitmap1.pixel_size == kLargeSize) {

- FaviconBitmap tmp_favicon_bitmap = favicon_bitmap1;

+ FaviconRawBitmap tmp_favicon_bitmap = favicon_bitmap1;

favicon_bitmap1 = favicon_bitmap2;

favicon_bitmap2 = tmp_favicon_bitmap;

}

@@ -1537,14 +1544,17 @@ TEST_F(HistoryBackendTest, SetFaviconMappingsForPageAndRedirects) {

const GURL icon_url2("http://www.google.com/icon2");

// Generate bitmap data for a page with two favicons.

- std::vector<favicon_base::FaviconBitmapData> two_favicon_bitmap_data;

- GenerateFaviconBitmapData(icon_url1, GetSizesSmallAndLarge(),

- icon_url2, GetSizesSmallAndLarge(), &two_favicon_bitmap_data);

+ std::vector<favicon_base::FaviconRawBitmapData> two_favicon_bitmap_data;

+ GenerateFaviconRawBitmapData(icon_url1,

+ GetSizesSmallAndLarge(),

+ icon_url2,

+ GetSizesSmallAndLarge(),

+ &two_favicon_bitmap_data);

// Generate bitmap data for a page with a single favicon.

- std::vector<favicon_base::FaviconBitmapData> one_favicon_bitmap_data;

- GenerateFaviconBitmapData(icon_url1, GetSizesSmallAndLarge(),

- &one_favicon_bitmap_data);

+ std::vector<favicon_base::FaviconRawBitmapData> one_favicon_bitmap_data;

+ GenerateFaviconRawBitmapData(

+ icon_url1, GetSizesSmallAndLarge(), &one_favicon_bitmap_data);

// Add two favicons

backend_->SetFavicons(url1, favicon_base::FAVICON, two_favicon_bitmap_data);

@@ -1599,9 +1609,9 @@ TEST_F(HistoryBackendTest, SetFaviconMappingsForPageDuplicates) {

const GURL url("http://www.google.com/");

const GURL icon_url("http://www.google.com/icon");

- std::vector<favicon_base::FaviconBitmapData> favicon_bitmap_data;

- GenerateFaviconBitmapData(icon_url, GetSizesSmallAndLarge(),

- &favicon_bitmap_data);

+ std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;

+ GenerateFaviconRawBitmapData(

+ icon_url, GetSizesSmallAndLarge(), &favicon_bitmap_data);

backend_->SetFavicons(url, favicon_base::FAVICON, favicon_bitmap_data);

@@ -1623,16 +1633,16 @@ TEST_F(HistoryBackendTest, SetFaviconMappingsForPageDuplicates) {

EXPECT_EQ(mapping_id, icon_mappings[0].mapping_id);

}

-// Test that calling SetFavicons() with FaviconBitmapData of different pixel

-// sizes than the initially passed in FaviconBitmapData deletes the no longer

+// Test that calling SetFavicons() with FaviconRawBitmapData of different pixel

+// sizes than the initially passed in FaviconRawBitmapData deletes the no longer

// used favicon bitmaps.

TEST_F(HistoryBackendTest, SetFaviconsDeleteBitmaps) {

const GURL page_url("http://www.google.com/");

const GURL icon_url("http://www.google.com/icon");

- std::vector<favicon_base::FaviconBitmapData> favicon_bitmap_data;

- GenerateFaviconBitmapData(icon_url, GetSizesSmallAndLarge(),

- &favicon_bitmap_data);

+ std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;

+ GenerateFaviconRawBitmapData(

+ icon_url, GetSizesSmallAndLarge(), &favicon_bitmap_data);

backend_->SetFavicons(page_url, favicon_base::FAVICON, favicon_bitmap_data);

// Test initial state.

@@ -1643,29 +1653,29 @@ TEST_F(HistoryBackendTest, SetFaviconsDeleteBitmaps) {

EXPECT_EQ(favicon_base::FAVICON, icon_mappings[0].icon_type);

favicon_base::FaviconID favicon_id = icon_mappings[0].icon_id;

- std::vector<FaviconBitmap> favicon_bitmaps;

- EXPECT_TRUE(GetSortedFaviconBitmaps(favicon_id, &favicon_bitmaps));

+ std::vector<FaviconRawBitmap> favicon_bitmaps;

+ EXPECT_TRUE(GetSortedFaviconRawBitmaps(favicon_id, &favicon_bitmaps));

EXPECT_EQ(2u, favicon_bitmaps.size());

- FaviconBitmapID small_bitmap_id = favicon_bitmaps[0].bitmap_id;

+ FaviconRawBitmapID small_bitmap_id = favicon_bitmaps[0].bitmap_id;

EXPECT_NE(0, small_bitmap_id);

EXPECT_TRUE(BitmapDataEqual('a', favicon_bitmaps[0].bitmap_data));

EXPECT_EQ(kSmallSize, favicon_bitmaps[0].pixel_size);

- FaviconBitmapID large_bitmap_id = favicon_bitmaps[1].bitmap_id;

+ FaviconRawBitmapID large_bitmap_id = favicon_bitmaps[1].bitmap_id;

EXPECT_NE(0, large_bitmap_id);

EXPECT_TRUE(BitmapDataEqual('b', favicon_bitmaps[1].bitmap_data));

EXPECT_EQ(kLargeSize, favicon_bitmaps[1].pixel_size);

// Call SetFavicons() with bitmap data for only the large bitmap. Check that

// the small bitmap is in fact deleted.

- GenerateFaviconBitmapData(icon_url, GetSizesLarge(), &favicon_bitmap_data);

+ GenerateFaviconRawBitmapData(icon_url, GetSizesLarge(), &favicon_bitmap_data);

backend_->SetFavicons(page_url, favicon_base::FAVICON, favicon_bitmap_data);

scoped_refptr<base::RefCountedMemory> bitmap_data_out;

gfx::Size pixel_size_out;

- EXPECT_FALSE(backend_->thumbnail_db_->GetFaviconBitmap(small_bitmap_id,

- NULL, &bitmap_data_out, &pixel_size_out));

- EXPECT_TRUE(backend_->thumbnail_db_->GetFaviconBitmap(large_bitmap_id,

- NULL, &bitmap_data_out, &pixel_size_out));

+ EXPECT_FALSE(backend_->thumbnail_db_->GetFaviconRawBitmap(

+ small_bitmap_id, NULL, &bitmap_data_out, &pixel_size_out));

+ EXPECT_TRUE(backend_->thumbnail_db_->GetFaviconRawBitmap(

+ large_bitmap_id, NULL, &bitmap_data_out, &pixel_size_out));

EXPECT_TRUE(BitmapDataEqual('a', bitmap_data_out));

EXPECT_EQ(kLargeSize, pixel_size_out);

@@ -1680,8 +1690,8 @@ TEST_F(HistoryBackendTest, SetFaviconsDeleteBitmaps) {

favicon_bitmap_data.clear();

backend_->SetFavicons(page_url, favicon_base::FAVICON, favicon_bitmap_data);

- EXPECT_FALSE(backend_->thumbnail_db_->GetFaviconBitmap(large_bitmap_id, NULL,

- NULL, NULL));

+ EXPECT_FALSE(backend_->thumbnail_db_->GetFaviconRawBitmap(

+ large_bitmap_id, NULL, NULL, NULL));

icon_mappings.clear();

EXPECT_FALSE(backend_->thumbnail_db_->GetIconMappingsForPageURL(page_url,

&icon_mappings));

@@ -1698,12 +1708,12 @@ TEST_F(HistoryBackendTest, SetFaviconsReplaceBitmapData) {

std::vector<unsigned char> data_initial;

data_initial.push_back('a');

- favicon_base::FaviconBitmapData bitmap_data_element;

+ favicon_base::FaviconRawBitmapData bitmap_data_element;

bitmap_data_element.bitmap_data =

base::RefCountedBytes::TakeVector(&data_initial);

bitmap_data_element.pixel_size = kSmallSize;

bitmap_data_element.icon_url = icon_url;

- std::vector<favicon_base::FaviconBitmapData> favicon_bitmap_data;

+ std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;

favicon_bitmap_data.push_back(bitmap_data_element);

// Add bitmap to the database.

@@ -1713,9 +1723,9 @@ TEST_F(HistoryBackendTest, SetFaviconsReplaceBitmapData) {

backend_->thumbnail_db_->GetFaviconIDForFaviconURL(

icon_url, favicon_base::FAVICON, NULL);

EXPECT_NE(0, original_favicon_id);

- FaviconBitmap original_favicon_bitmap;

+ FaviconRawBitmap original_favicon_bitmap;

EXPECT_TRUE(

- GetOnlyFaviconBitmap(original_favicon_id, &original_favicon_bitmap));

+ GetOnlyFaviconRawBitmap(original_favicon_id, &original_favicon_bitmap));

EXPECT_TRUE(BitmapDataEqual('a', original_favicon_bitmap.bitmap_data));

EXPECT_EQ(1, num_broadcasted_notifications());

@@ -1730,9 +1740,9 @@ TEST_F(HistoryBackendTest, SetFaviconsReplaceBitmapData) {

backend_->thumbnail_db_->GetFaviconIDForFaviconURL(

icon_url, favicon_base::FAVICON, NULL);

EXPECT_NE(0, updated_favicon_id);

- FaviconBitmap updated_favicon_bitmap;

+ FaviconRawBitmap updated_favicon_bitmap;

EXPECT_TRUE(

- GetOnlyFaviconBitmap(updated_favicon_id, &updated_favicon_bitmap));

+ GetOnlyFaviconRawBitmap(updated_favicon_id, &updated_favicon_bitmap));

EXPECT_TRUE(BitmapDataEqual('a', updated_favicon_bitmap.bitmap_data));

// Because the bitmap data is byte equivalent, no notifications should have

@@ -1748,10 +1758,10 @@ TEST_F(HistoryBackendTest, SetFaviconsReplaceBitmapData) {

icon_url, favicon_base::FAVICON, NULL);

EXPECT_NE(0, updated_favicon_id);

EXPECT_TRUE(

- GetOnlyFaviconBitmap(updated_favicon_id, &updated_favicon_bitmap));

+ GetOnlyFaviconRawBitmap(updated_favicon_id, &updated_favicon_bitmap));

EXPECT_TRUE(BitmapDataEqual('b', updated_favicon_bitmap.bitmap_data));

- // There should be no churn in FaviconIDs or FaviconBitmapIds even though

+ // There should be no churn in FaviconIDs or FaviconRawBitmapIds even though

// the bitmap data changed.

EXPECT_EQ(original_favicon_bitmap.icon_id, updated_favicon_bitmap.icon_id);

EXPECT_EQ(original_favicon_bitmap.bitmap_id,

@@ -1770,16 +1780,16 @@ TEST_F(HistoryBackendTest, SetFaviconsSameFaviconURLForTwoPages) {

GURL page_url1("http://www.google.com");

GURL page_url2("http://www.google.ca");

- std::vector<favicon_base::FaviconBitmapData> favicon_bitmap_data;

- GenerateFaviconBitmapData(icon_url, GetSizesSmallAndLarge(),

- &favicon_bitmap_data);

+ std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;

+ GenerateFaviconRawBitmapData(

+ icon_url, GetSizesSmallAndLarge(), &favicon_bitmap_data);

backend_->SetFavicons(page_url1, favicon_base::FAVICON, favicon_bitmap_data);

std::vector<GURL> icon_urls;

icon_urls.push_back(icon_url);

- std::vector<favicon_base::FaviconBitmapResult> bitmap_results;

+ std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results;

backend_->UpdateFaviconMappingsAndFetch(page_url2,

icon_urls,

favicon_base::FAVICON,

@@ -1802,8 +1812,8 @@ TEST_F(HistoryBackendTest, SetFaviconsSameFaviconURLForTwoPages) {

EXPECT_EQ(favicon_id, icon_mappings[0].icon_id);

// Change the icon URL that |page_url1| is mapped to.

- GenerateFaviconBitmapData(icon_url_new, GetSizesSmall(),

- &favicon_bitmap_data);

+ GenerateFaviconRawBitmapData(

+ icon_url_new, GetSizesSmall(), &favicon_bitmap_data);

backend_->SetFavicons(page_url1, favicon_base::FAVICON, favicon_bitmap_data);

// |page_url1| should map to a new FaviconID and have valid bitmap data.

@@ -1814,8 +1824,8 @@ TEST_F(HistoryBackendTest, SetFaviconsSameFaviconURLForTwoPages) {

EXPECT_EQ(icon_url_new, icon_mappings[0].icon_url);

EXPECT_NE(favicon_id, icon_mappings[0].icon_id);

- std::vector<FaviconBitmap> favicon_bitmaps;

- EXPECT_TRUE(backend_->thumbnail_db_->GetFaviconBitmaps(

+ std::vector<FaviconRawBitmap> favicon_bitmaps;

+ EXPECT_TRUE(backend_->thumbnail_db_->GetFaviconRawBitmaps(

icon_mappings[0].icon_id, &favicon_bitmaps));

EXPECT_EQ(1u, favicon_bitmaps.size());

@@ -1828,8 +1838,8 @@ TEST_F(HistoryBackendTest, SetFaviconsSameFaviconURLForTwoPages) {

EXPECT_EQ(favicon_id, icon_mappings[0].icon_id);

favicon_bitmaps.clear();

- EXPECT_TRUE(backend_->thumbnail_db_->GetFaviconBitmaps(favicon_id,

- &favicon_bitmaps));

+ EXPECT_TRUE(backend_->thumbnail_db_->GetFaviconRawBitmaps(favicon_id,

+ &favicon_bitmaps));

EXPECT_EQ(2u, favicon_bitmaps.size());

// A notification should have been broadcast for each call to SetFavicons()

@@ -1843,8 +1853,8 @@ TEST_F(HistoryBackendTest, SetFaviconsSameFaviconURLForTwoPages) {

TEST_F(HistoryBackendTest, UpdateFaviconMappingsAndFetchNoChange) {

GURL page_url("http://www.google.com");

GURL icon_url("http://www.google.com/favicon.ico");

- std::vector<favicon_base::FaviconBitmapData> favicon_bitmap_data;

- GenerateFaviconBitmapData(icon_url, GetSizesSmall(), &favicon_bitmap_data);

+ std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;

+ GenerateFaviconRawBitmapData(icon_url, GetSizesSmall(), &favicon_bitmap_data);

backend_->SetFavicons(page_url, favicon_base::FAVICON, favicon_bitmap_data);

@@ -1857,7 +1867,7 @@ TEST_F(HistoryBackendTest, UpdateFaviconMappingsAndFetchNoChange) {

std::vector<GURL> icon_urls;

icon_urls.push_back(icon_url);

- std::vector<favicon_base::FaviconBitmapResult> bitmap_results;

+ std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results;

backend_->UpdateFaviconMappingsAndFetch(page_url,

icon_urls,

favicon_base::FAVICON,

@@ -1896,8 +1906,9 @@ TEST_F(HistoryBackendTest, MergeFaviconPageURLNotInDB) {

EXPECT_EQ(1u, icon_mappings.size());

EXPECT_EQ(icon_url, icon_mappings[0].icon_url);

- FaviconBitmap favicon_bitmap;

- EXPECT_TRUE(GetOnlyFaviconBitmap(icon_mappings[0].icon_id, &favicon_bitmap));

+ FaviconRawBitmap favicon_bitmap;

+ EXPECT_TRUE(

+ GetOnlyFaviconRawBitmap(icon_mappings[0].icon_id, &favicon_bitmap));

EXPECT_NE(base::Time(), favicon_bitmap.last_updated);

EXPECT_TRUE(BitmapDataEqual('a', favicon_bitmap.bitmap_data));

EXPECT_EQ(kSmallSize, favicon_bitmap.pixel_size);

@@ -1915,7 +1926,8 @@ TEST_F(HistoryBackendTest, MergeFaviconPageURLNotInDB) {

EXPECT_EQ(1u, icon_mappings.size());

EXPECT_EQ(icon_url, icon_mappings[0].icon_url);

- EXPECT_TRUE(GetOnlyFaviconBitmap(icon_mappings[0].icon_id, &favicon_bitmap));

+ EXPECT_TRUE(

+ GetOnlyFaviconRawBitmap(icon_mappings[0].icon_id, &favicon_bitmap));

EXPECT_NE(base::Time(), favicon_bitmap.last_updated);

EXPECT_TRUE(BitmapDataEqual('b', favicon_bitmap.bitmap_data));

EXPECT_EQ(kSmallSize, favicon_bitmap.pixel_size);

@@ -1927,9 +1939,9 @@ TEST_F(HistoryBackendTest, MergeFaviconPageURLInDB) {

GURL icon_url1("http:/www.google.com/favicon.ico");

GURL icon_url2("http://www.google.com/favicon2.ico");

- std::vector<favicon_base::FaviconBitmapData> favicon_bitmap_data;

- GenerateFaviconBitmapData(icon_url1, GetSizesSmall(),

- &favicon_bitmap_data);

+ std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;

+ GenerateFaviconRawBitmapData(

+ icon_url1, GetSizesSmall(), &favicon_bitmap_data);

backend_->SetFavicons(page_url, favicon_base::FAVICON, favicon_bitmap_data);

@@ -1940,8 +1952,9 @@ TEST_F(HistoryBackendTest, MergeFaviconPageURLInDB) {

EXPECT_EQ(1u, icon_mappings.size());

EXPECT_EQ(icon_url1, icon_mappings[0].icon_url);

- FaviconBitmap favicon_bitmap;

- EXPECT_TRUE(GetOnlyFaviconBitmap(icon_mappings[0].icon_id, &favicon_bitmap));

+ FaviconRawBitmap favicon_bitmap;

+ EXPECT_TRUE(

+ GetOnlyFaviconRawBitmap(icon_mappings[0].icon_id, &favicon_bitmap));

EXPECT_NE(base::Time(), favicon_bitmap.last_updated);

EXPECT_TRUE(BitmapDataEqual('a', favicon_bitmap.bitmap_data));

EXPECT_EQ(kSmallSize, favicon_bitmap.pixel_size);

@@ -1964,7 +1977,8 @@ TEST_F(HistoryBackendTest, MergeFaviconPageURLInDB) {

EXPECT_EQ(1u, icon_mappings.size());

EXPECT_EQ(icon_url1, icon_mappings[0].icon_url);

- EXPECT_TRUE(GetOnlyFaviconBitmap(icon_mappings[0].icon_id, &favicon_bitmap));

+ EXPECT_TRUE(

+ GetOnlyFaviconRawBitmap(icon_mappings[0].icon_id, &favicon_bitmap));

EXPECT_NE(base::Time(), favicon_bitmap.last_updated);

EXPECT_TRUE(BitmapDataEqual('a', favicon_bitmap.bitmap_data));

EXPECT_EQ(kSmallSize, favicon_bitmap.pixel_size);

@@ -1984,7 +1998,8 @@ TEST_F(HistoryBackendTest, MergeFaviconPageURLInDB) {

EXPECT_EQ(1u, icon_mappings.size());

EXPECT_EQ(icon_url1, icon_mappings[0].icon_url);

- EXPECT_TRUE(GetOnlyFaviconBitmap(icon_mappings[0].icon_id, &favicon_bitmap));

+ EXPECT_TRUE(

+ GetOnlyFaviconRawBitmap(icon_mappings[0].icon_id, &favicon_bitmap));

EXPECT_NE(base::Time(), favicon_bitmap.last_updated);

EXPECT_TRUE(BitmapDataEqual('b', favicon_bitmap.bitmap_data));

EXPECT_EQ(kSmallSize, favicon_bitmap.pixel_size);

@@ -2004,9 +2019,9 @@ TEST_F(HistoryBackendTest, MergeFaviconPageURLInDB) {

EXPECT_EQ(1u, icon_mappings.size());

EXPECT_EQ(icon_url1, icon_mappings[0].icon_url);

- std::vector<FaviconBitmap> favicon_bitmaps;

- EXPECT_TRUE(GetSortedFaviconBitmaps(icon_mappings[0].icon_id,

- &favicon_bitmaps));

+ std::vector<FaviconRawBitmap> favicon_bitmaps;

+ EXPECT_TRUE(

+ GetSortedFaviconRawBitmaps(icon_mappings[0].icon_id, &favicon_bitmaps));

EXPECT_NE(base::Time(), favicon_bitmaps[0].last_updated);

EXPECT_TRUE(BitmapDataEqual('c', favicon_bitmaps[0].bitmap_data));

EXPECT_EQ(kTinySize, favicon_bitmaps[0].pixel_size);

@@ -2030,8 +2045,8 @@ TEST_F(HistoryBackendTest, MergeFaviconPageURLInDB) {

EXPECT_EQ(icon_url2, icon_mappings[0].icon_url);

favicon_bitmaps.clear();

- EXPECT_TRUE(GetSortedFaviconBitmaps(icon_mappings[0].icon_id,

- &favicon_bitmaps));

+ EXPECT_TRUE(

+ GetSortedFaviconRawBitmaps(icon_mappings[0].icon_id, &favicon_bitmaps));

EXPECT_EQ(base::Time(), favicon_bitmaps[0].last_updated);

EXPECT_TRUE(BitmapDataEqual('c', favicon_bitmaps[0].bitmap_data));

EXPECT_EQ(kTinySize, favicon_bitmaps[0].pixel_size);

@@ -2054,9 +2069,8 @@ TEST_F(HistoryBackendTest, MergeFaviconIconURLMappedToDifferentPageURL) {

GURL page_url3("http://maps.google.com");

GURL icon_url("http:/www.google.com/favicon.ico");

- std::vector<favicon_base::FaviconBitmapData> favicon_bitmap_data;

- GenerateFaviconBitmapData(icon_url, GetSizesSmall(),

- &favicon_bitmap_data);

+ std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;

+ GenerateFaviconRawBitmapData(icon_url, GetSizesSmall(), &favicon_bitmap_data);

backend_->SetFavicons(page_url1, favicon_base::FAVICON, favicon_bitmap_data);

@@ -2067,8 +2081,9 @@ TEST_F(HistoryBackendTest, MergeFaviconIconURLMappedToDifferentPageURL) {

EXPECT_EQ(1u, icon_mappings.size());

EXPECT_EQ(icon_url, icon_mappings[0].icon_url);

- FaviconBitmap favicon_bitmap;

- EXPECT_TRUE(GetOnlyFaviconBitmap(icon_mappings[0].icon_id, &favicon_bitmap));

+ FaviconRawBitmap favicon_bitmap;

+ EXPECT_TRUE(

+ GetOnlyFaviconRawBitmap(icon_mappings[0].icon_id, &favicon_bitmap));

EXPECT_NE(base::Time(), favicon_bitmap.last_updated);

EXPECT_TRUE(BitmapDataEqual('a', favicon_bitmap.bitmap_data));

EXPECT_EQ(kSmallSize, favicon_bitmap.pixel_size);

@@ -2087,7 +2102,7 @@ TEST_F(HistoryBackendTest, MergeFaviconIconURLMappedToDifferentPageURL) {

icon_url, favicon_base::FAVICON, NULL);

EXPECT_NE(0, favicon_id);

- EXPECT_TRUE(GetOnlyFaviconBitmap(favicon_id, &favicon_bitmap));

+ EXPECT_TRUE(GetOnlyFaviconRawBitmap(favicon_id, &favicon_bitmap));

EXPECT_NE(base::Time(), favicon_bitmap.last_updated);

EXPECT_TRUE(BitmapDataEqual('a', favicon_bitmap.bitmap_data));

EXPECT_EQ(kSmallSize, favicon_bitmap.pixel_size);

@@ -2102,7 +2117,7 @@ TEST_F(HistoryBackendTest, MergeFaviconIconURLMappedToDifferentPageURL) {

icon_url, favicon_base::FAVICON, NULL);

EXPECT_NE(0, favicon_id);

- EXPECT_TRUE(GetOnlyFaviconBitmap(favicon_id, &favicon_bitmap));

+ EXPECT_TRUE(GetOnlyFaviconRawBitmap(favicon_id, &favicon_bitmap));

EXPECT_NE(base::Time(), favicon_bitmap.last_updated);

EXPECT_TRUE(BitmapDataEqual('b', favicon_bitmap.bitmap_data));

EXPECT_EQ(kSmallSize, favicon_bitmap.pixel_size);

@@ -2132,8 +2147,8 @@ TEST_F(HistoryBackendTest, MergeFaviconIconURLMappedToDifferentPageURL) {

}

// Test that MergeFavicon() does not add more than

-// |kMaxFaviconBitmapsPerIconURL| to a favicon.

-TEST_F(HistoryBackendTest, MergeFaviconMaxFaviconBitmapsPerIconURL) {

+// |kMaxFaviconRawBitmapsPerIconURL| to a favicon.

+TEST_F(HistoryBackendTest, MergeFaviconMaxFaviconRawBitmapsPerIconURL) {

GURL page_url("http://www.google.com");

std::string icon_url_string("http://www.google.com/favicon.ico");

size_t replace_index = icon_url_string.size() - 1;

@@ -2144,7 +2159,7 @@ TEST_F(HistoryBackendTest, MergeFaviconMaxFaviconBitmapsPerIconURL) {

base::RefCountedBytes::TakeVector(&data);

int pixel_size = 1;

- for (size_t i = 0; i < kMaxFaviconBitmapsPerIconURL + 1; ++i) {

+ for (size_t i = 0; i < kMaxFaviconRawBitmapsPerIconURL + 1; ++i) {

icon_url_string[replace_index] = '0' + i;

GURL icon_url(icon_url_string);

@@ -2157,15 +2172,15 @@ TEST_F(HistoryBackendTest, MergeFaviconMaxFaviconBitmapsPerIconURL) {

}

// There should be a single favicon mapped to |page_url| with exactly

- // kMaxFaviconBitmapsPerIconURL favicon bitmaps.

+ // kMaxFaviconRawBitmapsPerIconURL favicon bitmaps.

std::vector<IconMapping> icon_mappings;

EXPECT_TRUE(backend_->thumbnail_db_->GetIconMappingsForPageURL(page_url,

&icon_mappings));

EXPECT_EQ(1u, icon_mappings.size());

- std::vector<FaviconBitmap> favicon_bitmaps;

- EXPECT_TRUE(backend_->thumbnail_db_->GetFaviconBitmaps(

+ std::vector<FaviconRawBitmap> favicon_bitmaps;

+ EXPECT_TRUE(backend_->thumbnail_db_->GetFaviconRawBitmaps(

icon_mappings[0].icon_id, &favicon_bitmaps));

- EXPECT_EQ(kMaxFaviconBitmapsPerIconURL, favicon_bitmaps.size());

+ EXPECT_EQ(kMaxFaviconRawBitmapsPerIconURL, favicon_bitmaps.size());

}

// Tests that the favicon set by MergeFavicon() shows up in the result of

@@ -2175,9 +2190,9 @@ TEST_F(HistoryBackendTest, MergeFaviconShowsUpInGetFaviconsForURLResult) {

GURL icon_url("http://www.google.com/favicon.ico");

GURL merged_icon_url("http://wwww.google.com/favicon2.ico");

- std::vector<favicon_base::FaviconBitmapData> favicon_bitmap_data;

- GenerateFaviconBitmapData(icon_url, GetSizesSmallAndLarge(),

- &favicon_bitmap_data);

+ std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;

+ GenerateFaviconRawBitmapData(

+ icon_url, GetSizesSmallAndLarge(), &favicon_bitmap_data);

// Set some preexisting favicons for |page_url|.

backend_->SetFavicons(page_url, favicon_base::FAVICON, favicon_bitmap_data);

@@ -2195,7 +2210,7 @@ TEST_F(HistoryBackendTest, MergeFaviconShowsUpInGetFaviconsForURLResult) {

// Request favicon bitmaps for both 1x and 2x to simulate request done by

// BookmarkModel::GetFavicon().

- std::vector<favicon_base::FaviconBitmapResult> bitmap_results;

+ std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results;

backend_->GetFaviconsForURL(page_url,

favicon_base::FAVICON,

kSmallSize.width(),

@@ -2203,8 +2218,8 @@ TEST_F(HistoryBackendTest, MergeFaviconShowsUpInGetFaviconsForURLResult) {

&bitmap_results);

EXPECT_EQ(2u, bitmap_results.size());

- const favicon_base::FaviconBitmapResult& first_result = bitmap_results[0];

- const favicon_base::FaviconBitmapResult& result =

+ const favicon_base::FaviconRawBitmapResult& first_result = bitmap_results[0];

+ const favicon_base::FaviconRawBitmapResult& result =

(first_result.pixel_size == kSmallSize) ? first_result

: bitmap_results[1];

EXPECT_TRUE(BitmapDataEqual('c', result.bitmap_data));

@@ -2216,17 +2231,18 @@ TEST_F(HistoryBackendTest, TestGetFaviconsForURLWithIconTypesPriority) {

GURL icon_url("http://www.google.com/favicon.ico");

GURL touch_icon_url("http://wwww.google.com/touch_icon.ico");

- std::vector<favicon_base::FaviconBitmapData> favicon_bitmap_data;

+ std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;

std::vector<gfx::Size> favicon_size;

favicon_size.push_back(gfx::Size(16, 16));

favicon_size.push_back(gfx::Size(32, 32));

- GenerateFaviconBitmapData(icon_url, favicon_size, &favicon_bitmap_data);

+ GenerateFaviconRawBitmapData(icon_url, favicon_size, &favicon_bitmap_data);

ASSERT_EQ(2u, favicon_bitmap_data.size());

- std::vector<favicon_base::FaviconBitmapData> touch_icon_bitmap_data;

+ std::vector<favicon_base::FaviconRawBitmapData> touch_icon_bitmap_data;

std::vector<gfx::Size> touch_icon_size;

touch_icon_size.push_back(gfx::Size(64, 64));

- GenerateFaviconBitmapData(icon_url, touch_icon_size, &touch_icon_bitmap_data);

+ GenerateFaviconRawBitmapData(

+ icon_url, touch_icon_size, &touch_icon_bitmap_data);

ASSERT_EQ(1u, touch_icon_bitmap_data.size());

// Set some preexisting favicons for |page_url|.

@@ -2234,7 +2250,7 @@ TEST_F(HistoryBackendTest, TestGetFaviconsForURLWithIconTypesPriority) {

backend_->SetFavicons(

page_url, favicon_base::TOUCH_ICON, touch_icon_bitmap_data);

- favicon_base::FaviconBitmapResult result;

+ favicon_base::FaviconRawBitmapResult result;

std::vector<int> icon_types;

icon_types.push_back(favicon_base::FAVICON);

icon_types.push_back(favicon_base::TOUCH_ICON);

@@ -2258,17 +2274,18 @@ TEST_F(HistoryBackendTest, TestGetFaviconsForURLReturnFavicon) {

GURL icon_url("http://www.google.com/favicon.ico");

GURL touch_icon_url("http://wwww.google.com/touch_icon.ico");

- std::vector<favicon_base::FaviconBitmapData> favicon_bitmap_data;

+ std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;

std::vector<gfx::Size> favicon_size;

favicon_size.push_back(gfx::Size(16, 16));

favicon_size.push_back(gfx::Size(32, 32));

- GenerateFaviconBitmapData(icon_url, favicon_size, &favicon_bitmap_data);

+ GenerateFaviconRawBitmapData(icon_url, favicon_size, &favicon_bitmap_data);

ASSERT_EQ(2u, favicon_bitmap_data.size());

- std::vector<favicon_base::FaviconBitmapData> touch_icon_bitmap_data;

+ std::vector<favicon_base::FaviconRawBitmapData> touch_icon_bitmap_data;

std::vector<gfx::Size> touch_icon_size;

touch_icon_size.push_back(gfx::Size(32, 32));

- GenerateFaviconBitmapData(icon_url, touch_icon_size, &touch_icon_bitmap_data);

+ GenerateFaviconRawBitmapData(

+ icon_url, touch_icon_size, &touch_icon_bitmap_data);

ASSERT_EQ(1u, touch_icon_bitmap_data.size());

// Set some preexisting favicons for |page_url|.

@@ -2276,7 +2293,7 @@ TEST_F(HistoryBackendTest, TestGetFaviconsForURLReturnFavicon) {

backend_->SetFavicons(

page_url, favicon_base::TOUCH_ICON, touch_icon_bitmap_data);

- favicon_base::FaviconBitmapResult result;

+ favicon_base::FaviconRawBitmapResult result;

std::vector<int> icon_types;

icon_types.push_back(favicon_base::FAVICON);

icon_types.push_back(favicon_base::TOUCH_ICON);

@@ -2288,7 +2305,7 @@ TEST_F(HistoryBackendTest, TestGetFaviconsForURLReturnFavicon) {

EXPECT_EQ(favicon_base::FAVICON, result.icon_type);

// Change minimal size to 32x32 and verify the 32x32 favicon returned.

- favicon_base::FaviconBitmapResult result1;

+ favicon_base::FaviconRawBitmapResult result1;

backend_->GetLargestFaviconForURL(page_url, icon_types, 32, &result1);

EXPECT_EQ(gfx::Size(32, 32), result1.pixel_size);

EXPECT_EQ(favicon_base::FAVICON, result1.icon_type);

@@ -2300,16 +2317,16 @@ TEST_F(HistoryBackendTest, TestGetFaviconsForURLReturnFaviconEvenItSmaller) {

GURL page_url("http://www.google.com");

GURL icon_url("http://www.google.com/favicon.ico");

- std::vector<favicon_base::FaviconBitmapData> favicon_bitmap_data;

+ std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;

std::vector<gfx::Size> favicon_size;

favicon_size.push_back(gfx::Size(16, 16));

- GenerateFaviconBitmapData(icon_url, favicon_size, &favicon_bitmap_data);

+ GenerateFaviconRawBitmapData(icon_url, favicon_size, &favicon_bitmap_data);

ASSERT_EQ(1u, favicon_bitmap_data.size());

// Set preexisting favicons for |page_url|.

backend_->SetFavicons(page_url, favicon_base::FAVICON, favicon_bitmap_data);

- favicon_base::FaviconBitmapResult result;

+ favicon_base::FaviconRawBitmapResult result;

std::vector<int> icon_types;

icon_types.push_back(favicon_base::FAVICON);

icon_types.push_back(favicon_base::TOUCH_ICON);

@@ -2331,15 +2348,19 @@ TEST_F(HistoryBackendTest, UpdateFaviconMappingsAndFetchMultipleIconTypes) {

GURL icon_urlc("http://www.google.com/favicon3.ico");

// |page_url1| is mapped to |icon_urla| which if of type TOUCH_ICON.

- std::vector<favicon_base::FaviconBitmapData> favicon_bitmap_data;

- GenerateFaviconBitmapData(icon_urla, GetSizesSmall(), &favicon_bitmap_data);

+ std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;

+ GenerateFaviconRawBitmapData(

+ icon_urla, GetSizesSmall(), &favicon_bitmap_data);

backend_->SetFavicons(

page_url1, favicon_base::TOUCH_ICON, favicon_bitmap_data);

// TOUCH_PRECOMPOSED_ICON.

- GenerateFaviconBitmapData(icon_urlb, GetSizesSmall(), icon_urlc,

- GetSizesSmall(), &favicon_bitmap_data);

+ GenerateFaviconRawBitmapData(icon_urlb,

+ GetSizesSmall(),

+ icon_urlc,

+ GetSizesSmall(),

+ &favicon_bitmap_data);

backend_->SetFavicons(

page_url2, favicon_base::TOUCH_PRECOMPOSED_ICON, favicon_bitmap_data);

@@ -2348,7 +2369,7 @@ TEST_F(HistoryBackendTest, UpdateFaviconMappingsAndFetchMultipleIconTypes) {

icon_urls.push_back(icon_urlb);

icon_urls.push_back(icon_urlc);

- std::vector<favicon_base::FaviconBitmapResult> bitmap_results;

+ std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results;

backend_->UpdateFaviconMappingsAndFetch(

page_url3,

icon_urls,

@@ -2389,7 +2410,7 @@ TEST_F(HistoryBackendTest, UpdateFaviconMappingsAndFetchMultipleIconTypes) {

TEST_F(HistoryBackendTest, GetFaviconsFromDBEmpty) {

const GURL page_url("http://www.google.com/");

- std::vector<favicon_base::FaviconBitmapResult> bitmap_results;

+ std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results;

EXPECT_FALSE(backend_->GetFaviconsFromDB(page_url,

favicon_base::FAVICON,

kSmallSize.width(),

@@ -2400,7 +2421,7 @@ TEST_F(HistoryBackendTest, GetFaviconsFromDBEmpty) {

// Test the results of GetFaviconsFromDB() when there are matching favicons

// but there are no associated favicon bitmaps.

-TEST_F(HistoryBackendTest, GetFaviconsFromDBNoFaviconBitmaps) {

+TEST_F(HistoryBackendTest, GetFaviconsFromDBNoFaviconRawBitmaps) {

const GURL page_url("http://www.google.com/");

const GURL icon_url("http://www.google.com/icon1");

@@ -2409,7 +2430,7 @@ TEST_F(HistoryBackendTest, GetFaviconsFromDBNoFaviconBitmaps) {

EXPECT_NE(0, icon_id);

EXPECT_NE(0, backend_->thumbnail_db_->AddIconMapping(page_url, icon_id));

- std::vector<favicon_base::FaviconBitmapResult> bitmap_results_out;

+ std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results_out;

EXPECT_FALSE(backend_->GetFaviconsFromDB(page_url,

favicon_base::FAVICON,

kSmallSize.width(),

@@ -2424,13 +2445,13 @@ TEST_F(HistoryBackendTest, GetFaviconsFromDBSelectClosestMatch) {

const GURL page_url("http://www.google.com/");

const GURL icon_url("http://www.google.com/icon1");

- std::vector<favicon_base::FaviconBitmapData> favicon_bitmap_data;

- GenerateFaviconBitmapData(icon_url, GetSizesTinySmallAndLarge(),

- &favicon_bitmap_data);

+ std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;

+ GenerateFaviconRawBitmapData(

+ icon_url, GetSizesTinySmallAndLarge(), &favicon_bitmap_data);

backend_->SetFavicons(page_url, favicon_base::FAVICON, favicon_bitmap_data);

- std::vector<favicon_base::FaviconBitmapResult> bitmap_results_out;

+ std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results_out;

EXPECT_TRUE(backend_->GetFaviconsFromDB(page_url,

favicon_base::FAVICON,

kSmallSize.width(),

@@ -2442,7 +2463,7 @@ TEST_F(HistoryBackendTest, GetFaviconsFromDBSelectClosestMatch) {

EXPECT_EQ(2u, bitmap_results_out.size());

// No required order for results.

if (bitmap_results_out[0].pixel_size == kLargeSize) {

- favicon_base::FaviconBitmapResult tmp_result = bitmap_results_out[0];

+ favicon_base::FaviconRawBitmapResult tmp_result = bitmap_results_out[0];

bitmap_results_out[0] = bitmap_results_out[1];

bitmap_results_out[1] = tmp_result;

}

@@ -2468,13 +2489,16 @@ TEST_F(HistoryBackendTest, GetFaviconsFromDBSingleIconURL) {

const GURL icon_url1("http://www.google.com/icon1");

const GURL icon_url2("http://www.google.com/icon2");

- std::vector<favicon_base::FaviconBitmapData> favicon_bitmap_data;

- GenerateFaviconBitmapData(icon_url1, GetSizesSmall(), icon_url2,

- GetSizesLarge(), &favicon_bitmap_data);

+ std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;

+ GenerateFaviconRawBitmapData(icon_url1,

+ GetSizesSmall(),

+ icon_url2,

+ GetSizesLarge(),

+ &favicon_bitmap_data);

backend_->SetFavicons(page_url, favicon_base::FAVICON, favicon_bitmap_data);

- std::vector<favicon_base::FaviconBitmapResult> bitmap_results_out;

+ std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results_out;

EXPECT_TRUE(backend_->GetFaviconsFromDB(page_url,

favicon_base::FAVICON,

kSmallSize.width(),

@@ -2495,15 +2519,17 @@ TEST_F(HistoryBackendTest, GetFaviconsFromDBIconType) {

const GURL icon_url1("http://www.google.com/icon1.png");

const GURL icon_url2("http://www.google.com/icon2.png");

- std::vector<favicon_base::FaviconBitmapData> favicon_bitmap_data;

- GenerateFaviconBitmapData(icon_url1, GetSizesSmall(), &favicon_bitmap_data);

+ std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;

+ GenerateFaviconRawBitmapData(

+ icon_url1, GetSizesSmall(), &favicon_bitmap_data);

backend_->SetFavicons(page_url, favicon_base::FAVICON, favicon_bitmap_data);

- GenerateFaviconBitmapData(icon_url2, GetSizesSmall(), &favicon_bitmap_data);

+ GenerateFaviconRawBitmapData(

+ icon_url2, GetSizesSmall(), &favicon_bitmap_data);

backend_->SetFavicons(

page_url, favicon_base::TOUCH_ICON, favicon_bitmap_data);

- std::vector<favicon_base::FaviconBitmapResult> bitmap_results_out;

+ std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results_out;

EXPECT_TRUE(backend_->GetFaviconsFromDB(page_url,

favicon_base::FAVICON,

kSmallSize.width(),

@@ -2542,7 +2568,7 @@ TEST_F(HistoryBackendTest, GetFaviconsFromDBExpired) {

EXPECT_NE(0, icon_id);

EXPECT_NE(0, backend_->thumbnail_db_->AddIconMapping(page_url, icon_id));

- std::vector<favicon_base::FaviconBitmapResult> bitmap_results_out;

+ std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results_out;

EXPECT_TRUE(backend_->GetFaviconsFromDB(page_url,

favicon_base::FAVICON,

kSmallSize.width(),

@@ -2559,7 +2585,7 @@ TEST_F(HistoryBackendTest, UpdateFaviconMappingsAndFetchNoDB) {

// Make the thumbnail database invalid.

backend_->thumbnail_db_.reset();

- std::vector<favicon_base::FaviconBitmapResult> bitmap_results;

+ std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results;

backend_->UpdateFaviconMappingsAndFetch(GURL(),

std::vector<GURL>(),

@@ -2578,14 +2604,14 @@ TEST_F(HistoryBackendTest, CloneFaviconIsRestrictedToSameDomain) {

const GURL icon_url("http://www.google.com/icon.png");

// Add a favicon

- std::vector<favicon_base::FaviconBitmapData> favicon_bitmap_data;

- GenerateFaviconBitmapData(icon_url, GetSizesSmall(), &favicon_bitmap_data);

+ std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;

+ GenerateFaviconRawBitmapData(icon_url, GetSizesSmall(), &favicon_bitmap_data);

backend_->SetFavicons(url, favicon_base::FAVICON, favicon_bitmap_data);

EXPECT_TRUE(backend_->thumbnail_db_->GetIconMappingsForPageURL(

url, favicon_base::FAVICON, NULL));

// Validate starting state.

- std::vector<favicon_base::FaviconBitmapResult> bitmap_results_out;

+ std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results_out;

EXPECT_TRUE(backend_->GetFaviconsFromDB(url,

favicon_base::FAVICON,

kSmallSize.width(),

« no previous file with comments | « chrome/browser/history/history_backend.cc ('k') | chrome/browser/history/history_service.h » ('j') | components/favicon_base/select_favicon_frames.h » ('J')