Make BookmarkModelVerifier wait for favicon load during GetFavicon

The test case for bookmark favicon sync was failing in its verification
step because GetFavicon sometimes returned a blank favicon for a URL.
This was because GetFavicon can be asynchronous if the favicon of a
bookmark node is not already loaded.

This patch modifies BookmarkModelVerifier::FaviconsMatch and wraps
BookmarkModel::GetFavicon with an additional wait on favicon load,
but only if a favicon was set for that particular URL.

BUG=69694
TEST=sync_integration_tests

Review URL: http://codereview.chromium.org/6760033

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80540 0039d316-1c4b-4281-b951-d872f2087c98
4 files changed