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

chrome/test/live_sync/many_client_preferences_sync_test.cc

Index: chrome/test/live_sync/many_client_preferences_sync_test.cc
diff --git a/chrome/test/live_sync/many_client_preferences_sync_test.cc b/chrome/test/live_sync/many_client_preferences_sync_test.cc
new file mode 100644
index 0000000000000000000000000000000000000000..cb48f89a282c8e116d3cf792bca9424ea6341d5f
--- /dev/null
+++ b/chrome/test/live_sync/many_client_preferences_sync_test.cc
@@ -0,0 +1,30 @@
+// 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/sync/profile_sync_service_harness.h"
+#include "chrome/common/pref_names.h"
+#include "chrome/test/live_sync/live_sync_test.h"
+#include "chrome/test/live_sync/preferences_helper.h"
+
+class ManyClientPreferencesSyncTest : public LiveSyncTest {
+ public:
+  ManyClientPreferencesSyncTest() : LiveSyncTest(MANY_CLIENT) {
+    PreferencesHelper::AssociateWithTest(this);
+  }
+  virtual ~ManyClientPreferencesSyncTest() {}
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ManyClientPreferencesSyncTest);
+};
+
+// TODO(rsimha): Enable once http://crbug.com/69604 is fixed.
+IN_PROC_BROWSER_TEST_F(ManyClientPreferencesSyncTest, DISABLED_Sanity) {
+  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+  ASSERT_TRUE(PreferencesHelper::BooleanPrefMatches(
+      prefs::kHomePageIsNewTabPage));
+  PreferencesHelper::ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage);
+  ASSERT_TRUE(GetClient(0)->AwaitGroupSyncCycleCompletion(clients()));
+  ASSERT_TRUE(PreferencesHelper::BooleanPrefMatches(
+      prefs::kHomePageIsNewTabPage));
+}