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

chrome/test/live_sync/sync_datatype_helper.cc

Index: chrome/test/live_sync/sync_datatype_helper.cc
diff --git a/chrome/test/live_sync/sync_datatype_helper.cc b/chrome/test/live_sync/sync_datatype_helper.cc
new file mode 100644
index 0000000000000000000000000000000000000000..5040295945b489981e1862a691aa30c7257efff6
--- /dev/null
+++ b/chrome/test/live_sync/sync_datatype_helper.cc
@@ -0,0 +1,27 @@
+// 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/test/live_sync/sync_datatype_helper.h"
+
+#include "chrome/test/live_sync/live_sync_test.h"
+
+SyncDatatypeHelper::SyncDatatypeHelper() {}
+
+SyncDatatypeHelper::~SyncDatatypeHelper() {}
+
+// static
+void SyncDatatypeHelper::AssociateWithTest(LiveSyncTest* test) {
+  ASSERT_TRUE(test != NULL) << "Cannot associate with null test.";

[tim (not reviewing), 2011/07/28 05:22:41]

ASSERT_NE 

[Raghu Simha, 2011/07/28 09:36:54]

Tried that earlier -- it turns out that the ASSERT_* macros don't support
pointer types like LiveSyncTest* because NULL is defined as the integer 0.

error C2446: '!=' : no conversion from 'LiveSyncTest *const ' to 'const int'

+  ASSERT_TRUE(test_ == NULL) << "Already associated with a test.";
+  test_ = test;
+}
+
+// static
+LiveSyncTest* SyncDatatypeHelper::test() {
+  EXPECT_TRUE(test_ != NULL) << "Must call AssociateWithTest first.";

[tim (not reviewing), 2011/07/28 05:22:41]

EXPECT_EQ

[Raghu Simha, 2011/07/28 09:36:54]

Same comment as above.

+  return test_;
+}
+
+// static
+LiveSyncTest* SyncDatatypeHelper::test_ = NULL;