sync: Remove the remaining conflict sets code

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

 // Copyright (c) 2012 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 150 matching lines @@
 
   ASSERT_TRUE(EnableEncryption(0, syncable::SESSIONS));
   GetClient(0)->service()->SetPassphrase(
       kValidPassphrase,
       ProfileSyncService::EXPLICIT,
       ProfileSyncService::USER_PROVIDED);
   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);
+      num_simple_conflicting_updates);
   // 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,
       ProfileSyncService::EXPLICIT,
       ProfileSyncService::USER_PROVIDED);
@@ skipping 29 matching lines @@
 
   ASSERT_TRUE(EnableEncryption(0, syncable::SESSIONS));
   GetClient(0)->service()->SetPassphrase(
       kValidPassphrase,
       ProfileSyncService::EXPLICIT,
       ProfileSyncService::USER_PROVIDED);
   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 nine non-blocking conflicts due to the two meta nodes (one for
-  // each client), plus the basic preference/themes/search engines nodes.
+      num_simple_conflicting_updates);
+  // We have nine encryption 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;
   ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL1),
       client0_windows.GetMutable()));
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_EQ(0, GetClient(1)->GetLastSessionSnapshot()->
-      num_blocking_conflicting_updates);
+      num_simple_conflicting_updates);
   ASSERT_EQ(NumberOfDefaultSyncItems() + 3,
       GetClient(1)->GetLastSessionSnapshot()->
       num_conflicting_updates);  // The encrypted nodes.
 
   GetClient(1)->service()->SetPassphrase(
       kValidPassphrase,
       ProfileSyncService::EXPLICIT,
       ProfileSyncService::USER_PROVIDED);
   ASSERT_TRUE(GetClient(1)->AwaitPassphraseAccepted());
   ASSERT_TRUE(GetClient(1)->WaitForTypeEncryption(syncable::SESSIONS));
@@ skipping 19 matching lines @@
 
   ASSERT_TRUE(EnableEncryption(0, syncable::SESSIONS));
   GetClient(0)->service()->SetPassphrase(
       kValidPassphrase,
       ProfileSyncService::EXPLICIT,
       ProfileSyncService::USER_PROVIDED);
   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
+      num_simple_conflicting_updates);
+  // We have two encryption 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.
 
   // 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()));
@@ skipping 43 matching lines @@
   // new passphrase and synced back. It will be unable to decrypt it yet.
   ASSERT_TRUE(EnableEncryption(0, syncable::SESSIONS));
   GetClient(0)->service()->SetPassphrase(
       kValidPassphrase,
       ProfileSyncService::EXPLICIT,
       ProfileSyncService::USER_PROVIDED);
   ASSERT_TRUE(GetClient(0)->AwaitPassphraseAccepted());
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(GetClient(1)->AwaitPassphraseRequired());
   ASSERT_EQ(0, GetClient(1)->GetLastSessionSnapshot()->
-      num_blocking_conflicting_updates);
-  // We have three non-blocking conflicts due to the two meta nodes (one for
+      num_simple_conflicting_updates);
+  // We have three encryption conflicts due to the two meta nodes (one for
   // each client), the one tab node, plus the basic preference/themes/search
   // engines nodes.
   ASSERT_GE(NumberOfDefaultSyncItems() + 3,
       GetClient(1)->GetLastSessionSnapshot()->
       num_conflicting_updates);  // The encrypted nodes.
 
   // At this point we enter the passphrase, triggering a resync.
   GetClient(1)->service()->SetPassphrase(
       kValidPassphrase,
       ProfileSyncService::EXPLICIT,
@@ skipping 37 matching lines @@
   ASSERT_TRUE(GetClient(1)->AwaitPassphraseRequired());
 
   // 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
+      num_simple_conflicting_updates);
+  // We have three encryption conflicts due to the two meta nodes (one for
   // each client), the one tab node, plus the basic preference/themes/search
   // engines nodes.
   ASSERT_EQ(NumberOfDefaultSyncItems() + 3,
       GetClient(1)->GetLastSessionSnapshot()->
       num_conflicting_updates);  // The encrypted nodes.
 
   GetClient(1)->service()->SetPassphrase(
       kValidPassphrase,
       ProfileSyncService::EXPLICIT,
       ProfileSyncService::USER_PROVIDED);
@@ skipping 73 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()));
 }