chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc - Issue 11428004: Sync the bookmark's 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/sync/test/integration/two_client_typed_urls_sync_test.cc

Issue 11428004: Sync the bookmark's icon URL (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 1 month 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/sync/test/integration/two_client_bookmarks_sync_test.cc ('K') | « chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc ('k') | sync/protocol/bookmark_specifics.proto » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc

diff --git a/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc b/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc

index 314633f43a54ea823425ae96eb3f765672467058..2c4ef164abe9dc584c5395fca347c9954f69d646 100644

--- a/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc

+++ b/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc

@@ -443,11 +443,13 @@ IN_PROC_BROWSER_TEST_F(TwoClientTypedUrlsSyncTest,

IN_PROC_BROWSER_TEST_F(TwoClientTypedUrlsSyncTest, BookmarksWithTypedVisit) {

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

+ GURL bookmark_icon_url("http://www.bookmark.google.com/favicon.ico");

ASSERT_TRUE(SetupClients());

// Create a bookmark.

const BookmarkNode* node = bookmarks_helper::AddURL(

0, bookmarks_helper::IndexedURLTitle(0), bookmark_url);

- bookmarks_helper::SetFavicon(0, node, bookmarks_helper::CreateFavicon(254));

+ bookmarks_helper::SetFavicon(0, node, bookmark_icon_url,

+ bookmarks_helper::CreateFavicon(SK_ColorWHITE));

ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";

ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));