Fix failing sync integration tests.

chrome/test/live_sync/two_client_live_preferences_sync_test.cc

 // Copyright (c) 2010 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 "chrome/browser/scoped_pref_update.h"
 #include "chrome/test/live_sync/live_preferences_sync_test.h"
 
 IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest,
                        kHomePageIsNewTabPage) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
@@ skipping 314 matching lines @@
   GetPrefs(0)->SetBoolean(prefs::kCertRevocationCheckingEnabled,
       new_kCertRevocationCheckingEnabled);
   GetVerifierPrefs()->SetBoolean(prefs::kSSL2Enabled, new_kSSL2Enabled);
   GetPrefs(0)->SetBoolean(prefs::kSSL2Enabled, new_kSSL2Enabled);
   GetVerifierPrefs()->SetBoolean(prefs::kSSL3Enabled, new_kSSL3Enabled);
   GetPrefs(0)->SetBoolean(prefs::kSSL3Enabled, new_kSSL3Enabled);
   GetVerifierPrefs()->SetBoolean(prefs::kTLS1Enabled, new_kTLS1Enabled);
   GetPrefs(0)->SetBoolean(prefs::kTLS1Enabled, new_kTLS1Enabled);
   EXPECT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
 
+  EXPECT_EQ(GetVerifierPrefs()->
+      GetBoolean(prefs::kCertRevocationCheckingEnabled),
+      GetPrefs(0)->GetBoolean(prefs::kCertRevocationCheckingEnabled));
   EXPECT_NE(GetVerifierPrefs()->
       GetBoolean(prefs::kCertRevocationCheckingEnabled),
-            GetPrefs(0)->GetBoolean(prefs::kCertRevocationCheckingEnabled));
-  EXPECT_NE(GetVerifierPrefs()->
-      GetBoolean(prefs::kCertRevocationCheckingEnabled),
-            GetPrefs(1)->GetBoolean(prefs::kCertRevocationCheckingEnabled));
-  EXPECT_NE(GetVerifierPrefs()->GetBoolean(prefs::kSSL2Enabled),
+      GetPrefs(1)->GetBoolean(prefs::kCertRevocationCheckingEnabled));
+  EXPECT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kSSL2Enabled),
             GetPrefs(0)->GetBoolean(prefs::kSSL2Enabled));
   EXPECT_NE(GetVerifierPrefs()->GetBoolean(prefs::kSSL2Enabled),
             GetPrefs(1)->GetBoolean(prefs::kSSL2Enabled));
-  EXPECT_NE(GetVerifierPrefs()->GetBoolean(prefs::kSSL3Enabled),
+  EXPECT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kSSL3Enabled),
             GetPrefs(0)->GetBoolean(prefs::kSSL3Enabled));
   EXPECT_NE(GetVerifierPrefs()->GetBoolean(prefs::kSSL3Enabled),
             GetPrefs(1)->GetBoolean(prefs::kSSL3Enabled));
-  EXPECT_NE(GetVerifierPrefs()->GetBoolean(prefs::kTLS1Enabled),
+  EXPECT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kTLS1Enabled),
             GetPrefs(0)->GetBoolean(prefs::kTLS1Enabled));
   EXPECT_NE(GetVerifierPrefs()->GetBoolean(prefs::kTLS1Enabled),
             GetPrefs(1)->GetBoolean(prefs::kTLS1Enabled));
 }
 #endif  // USE_NSS
 
 IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest, Privacy) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   EXPECT_EQ(GetPrefs(0)->GetBoolean(prefs::kAlternateErrorPagesEnabled),
             GetPrefs(1)->GetBoolean(prefs::kAlternateErrorPagesEnabled));
@@ skipping 208 matching lines @@
       new_kSafeBrowsingEnabled);
   GetPrefs(0)->SetBoolean(prefs::kSafeBrowsingEnabled,
       new_kSafeBrowsingEnabled);
   EXPECT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
 
   EXPECT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled),
             GetPrefs(0)->GetBoolean(prefs::kSafeBrowsingEnabled));
   EXPECT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled),
             GetPrefs(1)->GetBoolean(prefs::kSafeBrowsingEnabled));
 }