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

 // 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 "base/memory/scoped_vector.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/sync/sessions/session_state.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/browser/sync/test/integration/sessions_helper.h"
@@ skipping 142 matching lines @@
   ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL1),
       client0_windows.GetMutable()));
 
   ASSERT_TRUE(EnableEncryption(0, syncable::SESSIONS));
   GetClient(0)->service()->SetPassphrase(kValidPassphrase, true);
   ASSERT_TRUE(GetClient(0)->AwaitPassphraseAccepted());
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   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(NumberOfDefaultItems() + 3, GetClient(1)->GetLastSessionSnapshot()->
       num_conflicting_updates);  // The encrypted nodes.
 
   GetClient(1)->service()->SetPassphrase(kValidPassphrase, true);
   ASSERT_TRUE(GetClient(1)->AwaitPassphraseAccepted());
   ASSERT_TRUE(GetClient(1)->WaitForTypeEncryption(syncable::SESSIONS));
 
   ASSERT_TRUE(IsEncrypted(0, syncable::SESSIONS));
   ASSERT_TRUE(IsEncrypted(1, syncable::SESSIONS));
   // Get foreign session data from client 0 and 1.
   SyncedSessionVector sessions1;
@@ skipping 58 matching lines @@
   ASSERT_TRUE(CheckInitialState(1));
 
   ASSERT_TRUE(EnableEncryption(0, syncable::SESSIONS));
   GetClient(0)->service()->SetPassphrase(kValidPassphrase, true);
   ASSERT_TRUE(GetClient(0)->AwaitPassphraseAccepted());
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(GetClient(1)->AwaitPassphraseRequired());
   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(NumberOfDefaultItems() + 2, GetClient(1)->GetLastSessionSnapshot()->
       num_conflicting_updates);  // The encrypted nodes.
 
   // These changes are either made with the old passphrase or not encrypted at
   // all depending on when client 0's changes are propagated.
   ScopedWindowMap client1_windows;
   ASSERT_TRUE(OpenTabAndGetLocalWindows(1, GURL(kURL1),
       client1_windows.GetMutable()));
 
   // At this point we enter the passphrase, triggering a resync, in which the
   // local changes of client 1 get overwritten for now.
@@ skipping 75 matching lines @@
   // These changes will sync over to client 1, who will be unable to decrypt
   // them due to the missing passphrase.
   ScopedWindowMap client0_windows;
   ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL1),
       client0_windows.GetMutable()));
   ASSERT_TRUE(EnableEncryption(0, syncable::SESSIONS));
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   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(NumberOfDefaultItems() + 3, GetClient(1)->GetLastSessionSnapshot()->
       num_conflicting_updates);  // The encrypted nodes.
 
   GetClient(1)->service()->SetPassphrase(kValidPassphrase, true);
   ASSERT_TRUE(GetClient(1)->AwaitPassphraseAccepted());
   ASSERT_FALSE(GetClient(1)->service()->IsPassphraseRequired());
   ASSERT_TRUE(GetClient(1)->WaitForTypeEncryption(syncable::SESSIONS));
 
   // Open windows on client 1, which should automatically be encrypted.
   ScopedWindowMap client1_windows;
   ASSERT_TRUE(OpenTabAndGetLocalWindows(1, GURL(kURL2),
@@ skipping 66 matching lines @@
   ASSERT_FALSE(GetSessionData(1, &sessions1));
 
   // Client 0 becomes active again with a new tab.
   ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL2),
       client0_windows.GetMutable()));
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(GetSessionData(1, &sessions1));
   ASSERT_EQ(1U, sessions1.size());
   ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, *client0_windows.Get()));
 }