summaryrefslogtreecommitdiffstats
path: root/chrome/test/live_sync
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/test/live_sync
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/test/live_sync')
-rw-r--r--chrome/test/live_sync/bookmark_model_verifier.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/test/live_sync/bookmark_model_verifier.cc b/chrome/test/live_sync/bookmark_model_verifier.cc
index 4278b0f..05a2481 100644
--- a/chrome/test/live_sync/bookmark_model_verifier.cc
+++ b/chrome/test/live_sync/bookmark_model_verifier.cc
@@ -48,7 +48,7 @@ class FaviconLoadObserver : public BookmarkModelObserver {
virtual void BookmarkNodeChanged(BookmarkModel* model,
const BookmarkNode* node) {
if (model == model_ && node == node_)
- model->GetFavIcon(node);
+ model->GetFavicon(node);
}
virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
const BookmarkNode* node) {}
@@ -106,8 +106,8 @@ bool BookmarkModelVerifier::ModelsMatch(BookmarkModel* model_a,
EXPECT_TRUE(iterator_b.has_next());
const BookmarkNode* node_b = iterator_b.Next();
ret_val = ret_val && NodesMatch(node_a, node_b);
- const SkBitmap& bitmap_a = model_a->GetFavIcon(node_a);
- const SkBitmap& bitmap_b = model_b->GetFavIcon(node_b);
+ const SkBitmap& bitmap_a = model_a->GetFavicon(node_a);
+ const SkBitmap& bitmap_b = model_b->GetFavicon(node_b);
ret_val = ret_val && FaviconsMatch(bitmap_a, bitmap_b);
}
ret_val = ret_val && (!iterator_b.has_next());