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

chrome/test/live_sync/live_sync_test.h

Index: chrome/test/live_sync/live_sync_test.h
diff --git a/chrome/test/live_sync/live_sync_test.h b/chrome/test/live_sync/live_sync_test.h
index 1946be7ca87d9ab604928e29ecc906daff768492..309850b76cba4bbe09fda9d6a71e3c878bdb45f6 100644
--- a/chrome/test/live_sync/live_sync_test.h
+++ b/chrome/test/live_sync/live_sync_test.h
@@ -106,6 +106,14 @@ class LiveSyncTest : public InProcessBrowserTest {
   // individual sync profiles. Callee owns the object and manages its lifetime.
   Profile* verifier() WARN_UNUSED_RESULT;
 
+  // Used to determine whether the verifier profile should be updated or not.
+  bool use_verifier_prefs() WARN_UNUSED_RESULT { return use_verifier_prefs_; }
+
+  // After calling this method, changes made to a profile will no longer be
+  // reflected in the verifier profile. Note: Not all datatypes use this.
+  // TODO(rsimha): Hook up all datatypes to this mechanism.
+  void DisableVerifier();

[ncarter (slow), 2011/07/06 17:48:52]

Best to avoid per-datatype methods in LiveSyncTest -- if allowed to mushroom,
they'll muddy the capabilities of this class.  Here's a counterproposal: an
EnableVerifier(ModelType) and DisableVerifier(ModelType) pair.  Any unsupported
modeltypes can then become test failures.  (if you really wanted, you could use
varargs to make the call site cleaner for multiple datatypes)

[Raghu Simha, 2011/07/07 02:14:04]

It may not be readily evident yet, but this should ideally be a sync-wide
method. Over time, I had added copies of it to a bunch of different datatypes,
but now, I'm moving it into the base class so that each datatype can simply use
the mechanism that's in here. Now, if a test wants to make (racy) changes where
the end state is non-deterministic, it simply calls
LiveSyncTest::DisableVerifier(). In upcoming patches, I'll be removing the
copies in other datatypes.

+
   // Initializes sync clients and profiles but does not sync any of them.
   virtual bool SetupClients() WARN_UNUSED_RESULT;
 
@@ -232,6 +240,10 @@ class LiveSyncTest : public InProcessBrowserTest {
   // verifier profile are strictly local, and are not meant to be synced.
   scoped_ptr<Profile> verifier_;
 
+  // Indicates whether changes to a profile should also change the verifier
+  // profile or not.
+  bool use_verifier_prefs_;
+
   // Sync integration tests need to make live DNS requests for access to
   // GAIA and sync server URLs under google.com. We use a scoped version
   // to override the default resolver while the test is active.