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

chrome/test/live_sync/many_client_bookmarks_sync_test.cc

Index: chrome/test/live_sync/many_client_bookmarks_sync_test.cc
diff --git a/chrome/test/live_sync/many_client_bookmarks_sync_test.cc b/chrome/test/live_sync/many_client_bookmarks_sync_test.cc
new file mode 100644
index 0000000000000000000000000000000000000000..4a44fb2af1bdfcfab83a61c987b08e2e924ad63e
--- /dev/null
+++ b/chrome/test/live_sync/many_client_bookmarks_sync_test.cc
@@ -0,0 +1,26 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/sync/profile_sync_service_harness.h"
+#include "chrome/test/live_sync/bookmarks_helper.h"
+#include "chrome/test/live_sync/live_sync_test.h"
+
+class ManyClientBookmarksSyncTest : public LiveSyncTest {
+ public:
+  ManyClientBookmarksSyncTest() : LiveSyncTest(MANY_CLIENT) {}
+  virtual ~ManyClientBookmarksSyncTest() {}
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ManyClientBookmarksSyncTest);
+};
+
+// TODO(rsimha): Enable once http://crbug.com/69604 is fixed.
+IN_PROC_BROWSER_TEST_F(ManyClientBookmarksSyncTest, DISABLED_Sanity) {
+  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+  ASSERT_TRUE(BookmarksHelper::AddURL(
+      0, L"Google URL", GURL("http://www.google.com/")) != NULL);
+  ASSERT_TRUE(GetClient(0)->AwaitGroupSyncCycleCompletion(clients()));
+  ASSERT_TRUE(BookmarksHelper::AllModelsMatch());
+}