Add integraton test for sync backup/rollback.

chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc

Index: chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc
index 218c10cc0d9b9985f82c70d21ca08ebf53e9bdf0..15d661cda78dd5876c5b7b125d45843bba4e77ad 100644
--- a/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc
@@ -78,17 +78,17 @@ IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest, Sanity) {
   //        -> http://www.facebook.com "tier1_a_url2"
   //      -> tier1_b
   //        -> http://www.nhl.com "tier1_b_url0"
-  const BookmarkNode* top = AddFolder(0, GetOtherNode(0), 0, L"top");
-  const BookmarkNode* tier1_a = AddFolder(0, top, 0, L"tier1_a");
-  const BookmarkNode* tier1_b = AddFolder(0, top, 1, L"tier1_b");
+  const BookmarkNode* top = AddFolder(0, GetOtherNode(0), 0, "top");
+  const BookmarkNode* tier1_a = AddFolder(0, top, 0, "tier1_a");
+  const BookmarkNode* tier1_b = AddFolder(0, top, 1, "tier1_b");
   const BookmarkNode* tier1_a_url0 = AddURL(
-      0, tier1_a, 0, L"tier1_a_url0", GURL("http://mail.google.com"));
+      0, tier1_a, 0, "tier1_a_url0", GURL("http://mail.google.com"));
   const BookmarkNode* tier1_a_url1 = AddURL(
-      0, tier1_a, 1, L"tier1_a_url1", GURL("http://www.pandora.com"));
+      0, tier1_a, 1, "tier1_a_url1", GURL("http://www.pandora.com"));
   const BookmarkNode* tier1_a_url2 = AddURL(
-      0, tier1_a, 2, L"tier1_a_url2", GURL("http://www.facebook.com"));
+      0, tier1_a, 2, "tier1_a_url2", GURL("http://www.facebook.com"));
   const BookmarkNode* tier1_b_url0 = AddURL(
-      0, tier1_b, 0, L"tier1_b_url0", GURL("http://www.nhl.com"));
+      0, tier1_b, 0, "tier1_b_url0", GURL("http://www.nhl.com"));
 
   // Setup sync, wait for its completion, and make sure changes were synced.
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
@@ -117,7 +117,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest, Sanity) {
   //            -> Wynn (www.wynnlasvegas.com)
   //      -> tier1_a_url0
   const BookmarkNode* bar = GetBookmarkBarNode(0);
-  const BookmarkNode* cnn = AddURL(0, bar, 0, L"CNN",
+  const BookmarkNode* cnn = AddURL(0, bar, 0, "CNN",
       GURL("http://www.cnn.com"));
   ASSERT_TRUE(cnn != NULL);
   Move(0, tier1_a, bar, 1);
@@ -126,7 +126,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest, Sanity) {
   ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));
   ASSERT_TRUE(ModelMatchesVerifier(0));
 
-  const BookmarkNode* porsche = AddURL(0, bar, 2, L"Porsche",
+  const BookmarkNode* porsche = AddURL(0, bar, 2, "Porsche",
       GURL("http://www.porsche.com"));
   // Rearrange stuff in tier1_a.
   ASSERT_EQ(tier1_a, tier1_a_url2->parent());
@@ -141,21 +141,21 @@ IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest, Sanity) {
   ASSERT_EQ(1, tier1_a_url0->parent()->GetIndexOf(tier1_a_url0));
   Move(0, tier1_a_url0, bar, bar->child_count());
   const BookmarkNode* boa = AddURL(0, bar, bar->child_count(),
-      L"Bank of America", GURL("https://www.bankofamerica.com"));
+      "Bank of America", GURL("https://www.bankofamerica.com"));
   ASSERT_TRUE(boa != NULL);
   Move(0, tier1_a_url0, top, top->child_count());
   const BookmarkNode* bubble = AddURL(
-      0, bar, bar->child_count(), L"Seattle Bubble",
+      0, bar, bar->child_count(), "Seattle Bubble",
           GURL("http://seattlebubble.com"));
   ASSERT_TRUE(bubble != NULL);
-  const BookmarkNode* wired = AddURL(0, bar, 2, L"Wired News",
+  const BookmarkNode* wired = AddURL(0, bar, 2, "Wired News",
       GURL("http://www.wired.com"));
   const BookmarkNode* tier2_b = AddFolder(
-      0, tier1_b, 0, L"tier2_b");
+      0, tier1_b, 0, "tier2_b");
   Move(0, tier1_b_url0, tier2_b, 0);
   Move(0, porsche, bar, 0);
-  SetTitle(0, wired, L"News Wired");
-  SetTitle(0, porsche, L"ICanHazPorsche?");
+  SetTitle(0, wired, "News Wired");
+  SetTitle(0, porsche, "ICanHazPorsche?");
 
   // Wait for the title change to sync.
   ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));
@@ -165,10 +165,10 @@ IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest, Sanity) {
   Remove(0, top, top->child_count() - 1);
   Move(0, wired, tier1_b, 0);
   Move(0, porsche, bar, 3);
-  const BookmarkNode* tier3_b = AddFolder(0, tier2_b, 1, L"tier3_b");
+  const BookmarkNode* tier3_b = AddFolder(0, tier2_b, 1, "tier3_b");
   const BookmarkNode* leafs = AddURL(
-      0, tier1_a, 0, L"Toronto Maple Leafs", GURL("http://mapleleafs.nhl.com"));
-  const BookmarkNode* wynn = AddURL(0, bar, 1, L"Wynn",
+      0, tier1_a, 0, "Toronto Maple Leafs", GURL("http://mapleleafs.nhl.com"));
+  const BookmarkNode* wynn = AddURL(0, bar, 1, "Wynn",
       GURL("http://www.wynnlasvegas.com"));
 
   Move(0, wynn, tier3_b, 0);
@@ -197,7 +197,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest, InjectedBookmark) {
   ASSERT_TRUE(SetupClients());
   ASSERT_TRUE(SetupSync());
 
-  ASSERT_EQ(1, CountBookmarksWithTitlesMatching(0, base::UTF8ToWide(title)));
+  ASSERT_EQ(1, CountBookmarksWithTitlesMatching(0, title));
 }
 
 // Test that a client doesn't mutate the favicon data in the process
@@ -218,7 +218,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest,
 
   const GURL page_url("http://www.google.com");
   const GURL icon_url("http://www.google.com/favicon.ico");
-  const BookmarkNode* bookmark = AddURL(0, L"title", page_url);
+  const BookmarkNode* bookmark = AddURL(0, "title", page_url);
 
   // Simulate receiving a favicon from sync encoded by a different PNG encoder
   // than the one native to the OS. This tests the PNG data is not decoded to
@@ -262,21 +262,21 @@ IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest,
   //    -> http://yahoo.com
   // -> http://gmail.com
 
-  const BookmarkNode* folder0 = AddFolder(0, GetOtherNode(0), 0, L"folder0");
-  const BookmarkNode* tier1_a = AddFolder(0, folder0, 0, L"tier1_a");
-  ASSERT_TRUE(AddURL(0, folder0, 1, L"News", GURL("http://news.google.com")));
-  ASSERT_TRUE(AddURL(0, folder0, 2, L"Yahoo", GURL("http://www.yahoo.com")));
-  ASSERT_TRUE(AddURL(0, tier1_a, 0, L"Gmail", GURL("http://mail.google.com")));
-  ASSERT_TRUE(AddURL(0, tier1_a, 1, L"Google", GURL("http://www.google.com")));
+  const BookmarkNode* folder0 = AddFolder(0, GetOtherNode(0), 0, "folder0");
+  const BookmarkNode* tier1_a = AddFolder(0, folder0, 0, "tier1_a");
+  ASSERT_TRUE(AddURL(0, folder0, 1, "News", GURL("http://news.google.com")));
+  ASSERT_TRUE(AddURL(0, folder0, 2, "Yahoo", GURL("http://www.yahoo.com")));
+  ASSERT_TRUE(AddURL(0, tier1_a, 0, "Gmai", GURL("http://mail.google.com")));
+  ASSERT_TRUE(AddURL(0, tier1_a, 1, "Google", GURL("http://www.google.com")));
   ASSERT_TRUE(
-      AddURL(0, GetOtherNode(0), 1, L"CNN", GURL("http://www.cnn.com")));
+      AddURL(0, GetOtherNode(0), 1, "CNN", GURL("http://www.cnn.com")));
 
-  ASSERT_TRUE(AddFolder(0, GetBookmarkBarNode(0), 0, L"empty_folder"));
+  ASSERT_TRUE(AddFolder(0, GetBookmarkBarNode(0), 0, "empty_folder"));
   const BookmarkNode* folder1 =
-      AddFolder(0, GetBookmarkBarNode(0), 1, L"folder1");
-  ASSERT_TRUE(AddURL(0, folder1, 0, L"Yahoo", GURL("http://www.yahoo.com")));
+      AddFolder(0, GetBookmarkBarNode(0), 1, "folder1");
+  ASSERT_TRUE(AddURL(0, folder1, 0, "Yahoo", GURL("http://www.yahoo.com")));
   ASSERT_TRUE(
-      AddURL(0, GetBookmarkBarNode(0), 2, L"Gmail", GURL("http://gmail.com")));
+      AddURL(0, GetBookmarkBarNode(0), 2, "Gmai", GURL("http://gmail.com")));
 
   // Set up sync, wait for its completion and verify that changes propagated.
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";