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

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

Index: chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc
===================================================================
--- chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc	(revision 109292)
+++ chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc	(working copy)
@@ -160,10 +160,10 @@
   ASSERT_TRUE(GetClient(1)->AwaitPassphraseRequired());
   ASSERT_EQ(0, GetClient(1)->GetLastSessionSnapshot()->
       num_blocking_conflicting_updates);
-  // We have 6 non-blocking conflicts due to the two meta nodes (one for each
-  // client), the one tab node, and the six basic preference/themes/search
-  // engines.
-  ASSERT_EQ(9, GetClient(1)->GetLastSessionSnapshot()->
+  // We have two meta nodes (one for each client), the one tab node, plus the
+  // basic preference/themes/search engines items.
+  ASSERT_EQ(NumberOfDefaultSyncItems() + 3,
+      GetClient(1)->GetLastSessionSnapshot()->
       num_conflicting_updates);  // The encrypted nodes.
 
   GetClient(1)->service()->SetPassphrase(kValidPassphrase, true);
@@ -197,9 +197,10 @@
   ASSERT_TRUE(GetClient(1)->AwaitPassphraseRequired());
   ASSERT_EQ(0, GetClient(1)->GetLastSessionSnapshot()->
       num_blocking_conflicting_updates);
-  // We have eight non-blocking conflicts due to the two meta nodes (one for
-  // each client), and the 6 basic preference/themes/search engines nodes.
-  ASSERT_EQ(8, GetClient(1)->GetLastSessionSnapshot()->
+  // We have nine non-blocking conflicts due to the two meta nodes (one for
+  // each client), plus the basic preference/themes/search engines nodes.
+  ASSERT_EQ(NumberOfDefaultSyncItems() + 2,
+      GetClient(1)->GetLastSessionSnapshot()->
       num_conflicting_updates);  // The encrypted nodes.
 
   ScopedWindowMap client0_windows;
@@ -208,7 +209,8 @@
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_EQ(0, GetClient(1)->GetLastSessionSnapshot()->
       num_blocking_conflicting_updates);
-  ASSERT_EQ(9, GetClient(1)->GetLastSessionSnapshot()->
+  ASSERT_EQ(NumberOfDefaultSyncItems() + 3,
+      GetClient(1)->GetLastSessionSnapshot()->
       num_conflicting_updates);  // The encrypted nodes.
 
   GetClient(1)->service()->SetPassphrase(kValidPassphrase, true);
@@ -242,8 +244,9 @@
   ASSERT_EQ(0, GetClient(1)->GetLastSessionSnapshot()->
       num_blocking_conflicting_updates);
   // We have two non-blocking conflicts due to the two meta nodes (one for each
-  // client), and the 6 basic preference/themes/search engines nodes.
-  ASSERT_EQ(8, GetClient(1)->GetLastSessionSnapshot()->
+  // client), plus the basic preference/themes/search engines nodes.
+  ASSERT_EQ(NumberOfDefaultSyncItems() + 2,
+      GetClient(1)->GetLastSessionSnapshot()->
       num_conflicting_updates);  // The encrypted nodes.
 
   // These changes are either made with the old passphrase or not encrypted at
@@ -295,9 +298,10 @@
   ASSERT_EQ(0, GetClient(1)->GetLastSessionSnapshot()->
       num_blocking_conflicting_updates);
   // We have three non-blocking conflicts due to the two meta nodes (one for
-  // each client), the one tab node, and the 6 basic preference/themes/search
+  // each client), the one tab node, plus the basic preference/themes/search
   // engines nodes.
-  ASSERT_GE(9, GetClient(1)->GetLastSessionSnapshot()->
+  ASSERT_GE(NumberOfDefaultSyncItems() + 3,
+      GetClient(1)->GetLastSessionSnapshot()->
       num_conflicting_updates);  // The encrypted nodes.
 
   // At this point we enter the passphrase, triggering a resync.
@@ -339,9 +343,10 @@
   ASSERT_EQ(0, GetClient(1)->GetLastSessionSnapshot()->
       num_blocking_conflicting_updates);
   // We have three non-blocking conflicts due to the two meta nodes (one for
-  // each client), the one tab node, and the 6 basic preference/themes/search
+  // each client), the one tab node, plus the basic preference/themes/search
   // engines nodes.
-  ASSERT_EQ(9, GetClient(1)->GetLastSessionSnapshot()->
+  ASSERT_EQ(NumberOfDefaultSyncItems() + 3,
+      GetClient(1)->GetLastSessionSnapshot()->
       num_conflicting_updates);  // The encrypted nodes.
 
   GetClient(1)->service()->SetPassphrase(kValidPassphrase, true);