summaryrefslogtreecommitdiffstats
path: root/chrome/browser/history/thumbnail_database_unittest.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-15 14:42:27 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-15 14:42:27 +0000
commit9b488bda307fc224779706660915e8ac25d0eb8a (patch)
tree6c650aee74463b4dbc26d6d6cafd48656291c5c7 /chrome/browser/history/thumbnail_database_unittest.cc
parentacc9c371d618e9a3c4c52c899423e20cb114c5b7 (diff)
downloadchromium_src-9b488bda307fc224779706660915e8ac25d0eb8a.zip
chromium_src-9b488bda307fc224779706660915e8ac25d0eb8a.tar.gz
chromium_src-9b488bda307fc224779706660915e8ac25d0eb8a.tar.bz2
fav icon -> favicon. Pass 2: GetFavIcon -> GetFavicon
BUG=76073 TEST=none; no visible change Review URL: http://codereview.chromium.org/6685059 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78208 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history/thumbnail_database_unittest.cc')
-rw-r--r--chrome/browser/history/thumbnail_database_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/history/thumbnail_database_unittest.cc b/chrome/browser/history/thumbnail_database_unittest.cc
index cd40298..910b5a6 100644
--- a/chrome/browser/history/thumbnail_database_unittest.cc
+++ b/chrome/browser/history/thumbnail_database_unittest.cc
@@ -127,7 +127,7 @@ TEST_F(ThumbnailDatabaseTest, GetFaviconAfterMigrationToTopSites) {
base::Time time_out;
std::vector<unsigned char> favicon_out;
GURL url_out;
- EXPECT_TRUE(db.GetFavIcon(id, &time_out, &favicon_out, &url_out));
+ EXPECT_TRUE(db.GetFavicon(id, &time_out, &favicon_out, &url_out));
EXPECT_EQ(url, url_out);
EXPECT_EQ(time.ToTimeT(), time_out.ToTimeT());
ASSERT_EQ(data.size(), favicon_out.size());
@@ -429,7 +429,7 @@ TEST_F(IconMappingMigrationTest, TestIconMappingMigration) {
base::Time time;
std::vector<unsigned char> out_data;
GURL out_icon_url;
- ASSERT_TRUE(db.GetFavIcon(
+ ASSERT_TRUE(db.GetFavicon(
icon_mappings[0].icon_id, &time, &out_data, &out_icon_url));
EXPECT_EQ(icon1, out_icon_url);
@@ -450,7 +450,7 @@ TEST_F(IconMappingMigrationTest, TestIconMappingMigration) {
EXPECT_EQ(FAV_ICON, icon_mappings[0].icon_type);
EXPECT_EQ(page_url2, icon_mappings[0].page_url);
EXPECT_EQ(2, icon_mappings[0].icon_id);
- ASSERT_TRUE(db.GetFavIcon(
+ ASSERT_TRUE(db.GetFavicon(
icon_mappings[0].icon_id, &time, &out_data, &out_icon_url));
EXPECT_EQ(icon2, out_icon_url);