Merge 65840 - Provide sync integration tests with a way to set a favicon for ...

chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc

Index: chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc
===================================================================
--- chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc	(revision 66375)
+++ chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc	(working copy)
@@ -32,6 +32,14 @@
   return StringPrintf(L"Subsubfolder Name %d", i);
 }
 
+const std::vector<unsigned char> GenericFavicon() {
+  return LiveBookmarksSyncTest::CreateFavicon(254);
+}
+
+const std::vector<unsigned char> IndexedFavicon(int i) {
+  return LiveBookmarksSyncTest::CreateFavicon(i);
+}
+
 IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest, Sanity) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_TRUE(AllModelsMatchVerifier());
@@ -112,6 +120,19 @@
   ASSERT_TRUE(AllModelsMatchVerifier());
 }
 
+// Test Scribe ID - 370489.
+IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
+                       SC_AddFirstBMWithFavicon) {
+  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+  ASSERT_TRUE(AllModelsMatchVerifier());
+
+  const BookmarkNode* bookmark = AddURL(0, kGenericURLTitle, GURL(kGenericURL));
+  ASSERT_TRUE(bookmark != NULL);
+  SetFavicon(0, bookmark, GenericFavicon());
+  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+  ASSERT_TRUE(AllModelsMatchVerifier());
+}
+
 // Test Scribe ID - 370560.
 IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest, SC_AddNonHTTPBMs) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";