Merge search engines sync data type with Preferences. Sync the default search provider. Add some ...

chrome/browser/sync/test/integration/sync_test.h

Index: chrome/browser/sync/test/integration/sync_test.h
===================================================================
--- chrome/browser/sync/test/integration/sync_test.h	(revision 108905)
+++ chrome/browser/sync/test/integration/sync_test.h	(working copy)
@@ -180,6 +180,9 @@
   // Triggers setting the sync_tabs field of the nigori node.
   void TriggerSetSyncTabs();
 
+  // Returns the number of default items that every client syncs.
+  int NumberOfDefaultItems() const;

[Raghu Simha, 2011/11/07 22:18:12]

nit: Perhaps name this NumberOfDefaultSyncItems() to make its purpose clear?

[SteveT, 2011/11/08 00:17:27]

Sure. Done here and in sync_test.cc. Had to reformat the lines using this in
two_client_sessions_sync_test.cc. Let me know if you're happy with that change.

+
  protected:
   // Add custom switches needed for running the test.
   virtual void AddTestSwitches(CommandLine* cl);