Allow sync integration tests to operate on multiple datatypes: Preferences + Bookmarks

chrome/test/live_sync/performance/bookmarks_sync_perf_test.cc

Index: chrome/test/live_sync/performance/bookmarks_sync_perf_test.cc
diff --git a/chrome/test/live_sync/performance/bookmarks_sync_perf_test.cc b/chrome/test/live_sync/performance/bookmarks_sync_perf_test.cc
index a08a32fbb16c217edaf7dcfa0d06b8d2b6f8aaca..633b403b36d916c7244a7f4ab240b1f95b601890 100644
--- a/chrome/test/live_sync/performance/bookmarks_sync_perf_test.cc
+++ b/chrome/test/live_sync/performance/bookmarks_sync_perf_test.cc
@@ -3,7 +3,8 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/profile_sync_service_harness.h"
-#include "chrome/test/live_sync/live_bookmarks_sync_test.h"
+#include "chrome/test/live_sync/bookmarks_helper.h"
+#include "chrome/test/live_sync/live_sync_test.h"
 #include "chrome/test/live_sync/performance/sync_timing_helper.h"
 
 // TODO(braffert): Move kNumBenchmarkPoints and kBenchmarkPoints for all
@@ -14,10 +15,12 @@ static const int kBenchmarkPoints[] = {1, 10, 20, 30, 40, 50, 75, 100, 125,
                                        150, 175, 200, 225, 250, 300, 350, 400,
                                        500};
 
-class BookmarksSyncPerfTest
-    : public TwoClientLiveBookmarksSyncTest {
+class BookmarksSyncPerfTest : public LiveSyncTest {
  public:
-  BookmarksSyncPerfTest() : url_number(0), url_title_number(0) {}
+  BookmarksSyncPerfTest()
+      : LiveSyncTest(TWO_CLIENT),
+        url_number(0),
+        url_title_number(0) {}
 
   // Adds |num_urls| new unique bookmarks to the bookmark bar for |profile|.
   void AddURLs(int profile, int num_urls);
@@ -46,21 +49,25 @@ class BookmarksSyncPerfTest
 
 void BookmarksSyncPerfTest::AddURLs(int profile, int num_urls) {
   for (int i = 0; i < num_urls; ++i) {
-    ASSERT_TRUE(AddURL(
+    ASSERT_TRUE(BookmarksHelper::AddURL(
         profile, 0, NextIndexedURLTitle(), GURL(NextIndexedURL())) != NULL);
   }
 }
 
 void BookmarksSyncPerfTest::UpdateURLs(int profile) {
-  for (int i = 0; i < GetBookmarkBarNode(profile)->child_count(); ++i) {
-    ASSERT_TRUE(SetURL(profile, GetBookmarkBarNode(profile)->GetChild(i),
-                       GURL(NextIndexedURL())));
+  for (int i = 0;
+       i < BookmarksHelper::GetBookmarkBarNode(profile)->child_count();
+       ++i) {
+    ASSERT_TRUE(BookmarksHelper::SetURL(
+        profile, BookmarksHelper::GetBookmarkBarNode(profile)->GetChild(i),
+            GURL(NextIndexedURL())));
   }
 }
 
 void BookmarksSyncPerfTest::RemoveURLs(int profile) {
-  while (GetBookmarkBarNode(profile)->child_count()) {
-    Remove(profile, GetBookmarkBarNode(profile), 0);
+  while (!BookmarksHelper::GetBookmarkBarNode(profile)->empty()) {
+    BookmarksHelper::Remove(
+        profile, BookmarksHelper::GetBookmarkBarNode(profile), 0);
   }
 }
 
@@ -69,16 +76,16 @@ void BookmarksSyncPerfTest::Cleanup() {
     RemoveURLs(i);
   }
   ASSERT_TRUE(AwaitQuiescence());
-  ASSERT_EQ(0, GetBookmarkBarNode(0)->child_count());
-  ASSERT_TRUE(AllModelsMatch());
+  ASSERT_EQ(0, BookmarksHelper::GetBookmarkBarNode(0)->child_count());
+  ASSERT_TRUE(BookmarksHelper::AllModelsMatch());
 }
 
 std::string BookmarksSyncPerfTest::NextIndexedURL() {
-  return IndexedURL(url_number++);
+  return BookmarksHelper::IndexedURL(url_number++);
 }
 
 std::wstring BookmarksSyncPerfTest::NextIndexedURLTitle() {
-  return IndexedURLTitle(url_title_number++);
+  return BookmarksHelper::IndexedURLTitle(url_title_number++);
 }
 
 // TCM ID - 7556828.
@@ -89,8 +96,9 @@ IN_PROC_BROWSER_TEST_F(BookmarksSyncPerfTest, Add) {
   AddURLs(0, kNumBookmarks);
   base::TimeDelta dt =
       SyncTimingHelper::TimeMutualSyncCycle(GetClient(0), GetClient(1));
-  ASSERT_EQ(kNumBookmarks, GetBookmarkBarNode(0)->child_count());
-  ASSERT_TRUE(AllModelsMatch());
+  ASSERT_EQ(kNumBookmarks,
+            BookmarksHelper::GetBookmarkBarNode(0)->child_count());
+  ASSERT_TRUE(BookmarksHelper::AllModelsMatch());
 
   SyncTimingHelper::PrintResult("bookmarks", "add", dt);
 }
@@ -106,8 +114,9 @@ IN_PROC_BROWSER_TEST_F(BookmarksSyncPerfTest, Update) {
   UpdateURLs(0);
   base::TimeDelta dt =
       SyncTimingHelper::TimeMutualSyncCycle(GetClient(0), GetClient(1));
-  ASSERT_EQ(kNumBookmarks, GetBookmarkBarNode(0)->child_count());
-  ASSERT_TRUE(AllModelsMatch());
+  ASSERT_EQ(kNumBookmarks,
+            BookmarksHelper::GetBookmarkBarNode(0)->child_count());
+  ASSERT_TRUE(BookmarksHelper::AllModelsMatch());
 
   SyncTimingHelper::PrintResult("bookmarks", "update", dt);
 }
@@ -123,8 +132,8 @@ IN_PROC_BROWSER_TEST_F(BookmarksSyncPerfTest, Delete) {
   RemoveURLs(0);
   base::TimeDelta dt =
       SyncTimingHelper::TimeMutualSyncCycle(GetClient(0), GetClient(1));
-  ASSERT_EQ(0, GetBookmarkBarNode(0)->child_count());
-  ASSERT_TRUE(AllModelsMatch());
+  ASSERT_EQ(0, BookmarksHelper::GetBookmarkBarNode(0)->child_count());
+  ASSERT_TRUE(BookmarksHelper::AllModelsMatch());
 
   SyncTimingHelper::PrintResult("bookmarks", "delete", dt);
 }
@@ -138,24 +147,26 @@ IN_PROC_BROWSER_TEST_F(BookmarksSyncPerfTest, DISABLED_Benchmark) {
     AddURLs(0, num_bookmarks);
     base::TimeDelta dt_add =
         SyncTimingHelper::TimeMutualSyncCycle(GetClient(0), GetClient(1));
-    ASSERT_EQ(num_bookmarks, GetBookmarkBarNode(0)->child_count());
-    ASSERT_TRUE(AllModelsMatch());
+    ASSERT_EQ(num_bookmarks,
+              BookmarksHelper::GetBookmarkBarNode(0)->child_count());
+    ASSERT_TRUE(BookmarksHelper::AllModelsMatch());
     VLOG(0) << std::endl << "Add: " << num_bookmarks << " "
             << dt_add.InSecondsF();
 
     UpdateURLs(0);
     base::TimeDelta dt_update =
         SyncTimingHelper::TimeMutualSyncCycle(GetClient(0), GetClient(1));
-    ASSERT_EQ(num_bookmarks, GetBookmarkBarNode(0)->child_count());
-    ASSERT_TRUE(AllModelsMatch());
+    ASSERT_EQ(num_bookmarks,
+              BookmarksHelper::GetBookmarkBarNode(0)->child_count());
+    ASSERT_TRUE(BookmarksHelper::AllModelsMatch());
     VLOG(0) << std::endl << "Update: " << num_bookmarks << " "
             << dt_update.InSecondsF();
 
     RemoveURLs(0);
     base::TimeDelta dt_delete =
         SyncTimingHelper::TimeMutualSyncCycle(GetClient(0), GetClient(1));
-    ASSERT_EQ(0, GetBookmarkBarNode(0)->child_count());
-    ASSERT_TRUE(AllModelsMatch());
+    ASSERT_EQ(0, BookmarksHelper::GetBookmarkBarNode(0)->child_count());
+    ASSERT_TRUE(BookmarksHelper::AllModelsMatch());
     VLOG(0) << std::endl << "Delete: " << num_bookmarks << " "
             << dt_delete.InSecondsF();