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

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

Index: chrome/browser/sync/test/integration/sync_test.cc
===================================================================
--- chrome/browser/sync/test/integration/sync_test.cc	(revision 109292)
+++ chrome/browser/sync/test/integration/sync_test.cc	(working copy)
@@ -224,10 +224,6 @@
   // TODO(sync): Remove this once sessions sync is enabled by default.
   if (!cl->HasSwitch(switches::kEnableSyncTabs))
     cl->AppendSwitch(switches::kEnableSyncTabs);
-
-  // TODO(stevet): Remove this once search engines sync is enabled by default.
-  if (!cl->HasSwitch(switches::kEnableSyncSearchEngines))
-    cl->AppendSwitch(switches::kEnableSyncSearchEngines);
 }
 
 // static
@@ -703,6 +699,15 @@
             UTF16ToASCII(browser()->GetSelectedTabContents()->GetTitle()));
 }
 
+int SyncTest::NumberOfDefaultSyncItems() const {
+  // Just return the current number of basic sync items that are synced,
+  // including preferences, themes, and search engines.
+  // TODO(stevet): It would be nice if there was some mechanism for retrieving
+  // this sum from each data type without having to manually count and update
+  // this value.
+  return 7;
+}
+
 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter,
                               const net::ProxyConfig& proxy_config) {
   base::WaitableEvent done(false, false);