sync: Refactor TwoClientPreferencesSyncTest

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

Index: chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
index 7f644173f4e8a837f1038c9ae4b1fcf6f0995894..41b3ab53c1339fd3a9291d80ba7141baba1f0797 100644
--- a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
@@ -2,393 +2,118 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/values.h"
+#include "base/prefs/pref_service.h"
 #include "chrome/browser/sync/test/integration/preferences_helper.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
-#include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/common/pref_names.h"
-#include "components/password_manager/core/common/password_manager_pref_names.h"
-#include "components/sync_driver/pref_names.h"
-#include "components/translate/core/browser/translate_prefs.h"
-#include "components/translate/core/common/translate_pref_names.h"
 
-using preferences_helper::AppendStringPref;
+using preferences_helper::AwaitBooleanPrefMatches;
+using preferences_helper::AwaitIntegerPrefMatches;
+using preferences_helper::AwaitListPrefMatches;
+using preferences_helper::AwaitStringPrefMatches;
 using preferences_helper::BooleanPrefMatches;
 using preferences_helper::ChangeBooleanPref;
 using preferences_helper::ChangeIntegerPref;
-using preferences_helper::ChangeInt64Pref;
 using preferences_helper::ChangeListPref;
 using preferences_helper::ChangeStringPref;
 using preferences_helper::GetPrefs;
-using preferences_helper::IntegerPrefMatches;
-using preferences_helper::Int64PrefMatches;
-using preferences_helper::ListPrefMatches;
-using preferences_helper::StringPrefMatches;
-using sync_integration_test_util::AwaitCommitActivityCompletion;
 
 class TwoClientPreferencesSyncTest : public SyncTest {
  public:
   TwoClientPreferencesSyncTest() : SyncTest(TWO_CLIENT) {}
   virtual ~TwoClientPreferencesSyncTest() {}
 
+  virtual bool TestUsesSelfNotifications() OVERRIDE { return false; }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(TwoClientPreferencesSyncTest);
 };
 
-class LegacyTwoClientPreferencesSyncTest : public SyncTest {
- public:
-  LegacyTwoClientPreferencesSyncTest() : SyncTest(TWO_CLIENT_LEGACY) {}
-  virtual ~LegacyTwoClientPreferencesSyncTest() {}
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(LegacyTwoClientPreferencesSyncTest);
-};
-
-// TCM ID - 7306186.
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
-                       kHomePageIsNewTabPage) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage));
+IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, BooleanPref) {
+  ASSERT_TRUE(SetupSync());
+  ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kHomePageIsNewTabPage));
 
   ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage);
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage));
+  ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kHomePageIsNewTabPage));
 }
 
-// TCM ID - 7260488.
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, Race) {

[rlarocque, 2014/06/20 20:03:35]

Testing races is nonesense.  I've replaced it with a test that syncs changes
from client 0 to client 1, then from client 1 to client 0.  This is equivalent
to one of the possible race scenarios from this test.

-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, Bidirectional) {
+  ASSERT_TRUE(SetupSync());
   DisableVerifier();

[Nicolas Zea, 2014/07/09 18:52:15]

Why do we disable the verifier in these tests?

[rlarocque, 2014/07/09 19:01:17]

In this test, I think it's out of habit.  It's based on "Race", which couldn't
use the verifier because its outcome was not deterministic.  I'll try turning it
back on.

In the test below (UnsyncableBooleanPref), it's disabled because we expect some
of the preferences won't match.

 
-  ASSERT_TRUE(StringPrefMatches(prefs::kHomePage));
+  ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage));
 
   ChangeStringPref(0, prefs::kHomePage, "http://www.google.com/0");
-  ChangeStringPref(1, prefs::kHomePage, "http://www.google.com/1");
-  ASSERT_TRUE(AwaitQuiescence());
-  ASSERT_TRUE(StringPrefMatches(prefs::kHomePage));
-}
-
-// TCM ID - 3649278.
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
-                       kPasswordManagerEnabled) {

[rlarocque, 2014/06/20 20:03:35]

Covered by testing of boolean pref sync.

-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_TRUE(
-      BooleanPrefMatches(password_manager::prefs::kPasswordManagerEnabled));
-
-  ChangeBooleanPref(0, password_manager::prefs::kPasswordManagerEnabled);
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(
-      BooleanPrefMatches(password_manager::prefs::kPasswordManagerEnabled));
-}
-
-// TCM ID - 3699293.
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
-                       kSyncKeepEverythingSynced) {

[rlarocque, 2014/06/20 20:03:35]

I think this is better covered by sync_prefs_unittest.

-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  DisableVerifier();
-
-  ASSERT_TRUE(
-      BooleanPrefMatches(sync_driver::prefs::kSyncKeepEverythingSynced));
-  ASSERT_TRUE(BooleanPrefMatches(sync_driver::prefs::kSyncThemes));
-
-  GetClient(0)->DisableSyncForDatatype(syncer::THEMES);
-  ASSERT_FALSE(
-      BooleanPrefMatches(sync_driver::prefs::kSyncKeepEverythingSynced));
-}
-
-// TCM ID - 3661290.
-IN_PROC_BROWSER_TEST_F(LegacyTwoClientPreferencesSyncTest, DisablePreferences) {

[rlarocque, 2014/06/20 20:03:35]

Enable and disable tests: decided not to support these for every type.

-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  DisableVerifier();
-
-  ASSERT_TRUE(BooleanPrefMatches(sync_driver::prefs::kSyncPreferences));
-  ASSERT_TRUE(
-      BooleanPrefMatches(password_manager::prefs::kPasswordManagerEnabled));
-
-  GetClient(1)->DisableSyncForDatatype(syncer::PREFERENCES);
-  ChangeBooleanPref(0, password_manager::prefs::kPasswordManagerEnabled);
-  ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));
-  ASSERT_FALSE(
-      BooleanPrefMatches(password_manager::prefs::kPasswordManagerEnabled));
-
-  GetClient(1)->EnableSyncForDatatype(syncer::PREFERENCES);
-  ASSERT_TRUE(AwaitQuiescence());
-  ASSERT_TRUE(
-      BooleanPrefMatches(password_manager::prefs::kPasswordManagerEnabled));
-}
-
-// TCM ID - 3664292.
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, DisableSync) {

[rlarocque, 2014/06/20 20:03:35]

Another enable/disable test.

-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  DisableVerifier();
-
-  ASSERT_TRUE(BooleanPrefMatches(sync_driver::prefs::kSyncPreferences));
-  ASSERT_TRUE(
-      BooleanPrefMatches(password_manager::prefs::kPasswordManagerEnabled));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
-
-  GetClient(1)->DisableSyncForAllDatatypes();
-  ChangeBooleanPref(0, password_manager::prefs::kPasswordManagerEnabled);
-  ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));
-  ASSERT_FALSE(
-      BooleanPrefMatches(password_manager::prefs::kPasswordManagerEnabled));
-
-  ChangeBooleanPref(1, prefs::kShowHomeButton);
-  ASSERT_FALSE(BooleanPrefMatches(prefs::kShowHomeButton));
-
-  GetClient(1)->EnableSyncForAllDatatypes();
-  ASSERT_TRUE(AwaitQuiescence());
-  ASSERT_TRUE(
-      BooleanPrefMatches(password_manager::prefs::kPasswordManagerEnabled));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
-}
-
-// TCM ID - 3604297.
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, SignInDialog) {

[rlarocque, 2014/06/20 20:03:35]

I don't see much value in this test.  It toggles a bunch of non-syncable but
sync-affecting preferences, then makes sure that these preferences don't match. 
I can't imagine how this could fail.

-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  DisableVerifier();
-
-  ASSERT_TRUE(BooleanPrefMatches(sync_driver::prefs::kSyncPreferences));
-  ASSERT_TRUE(BooleanPrefMatches(sync_driver::prefs::kSyncBookmarks));
-  ASSERT_TRUE(BooleanPrefMatches(sync_driver::prefs::kSyncThemes));
-  ASSERT_TRUE(BooleanPrefMatches(sync_driver::prefs::kSyncExtensions));
-  ASSERT_TRUE(BooleanPrefMatches(sync_driver::prefs::kSyncAutofill));
-  ASSERT_TRUE(
-      BooleanPrefMatches(sync_driver::prefs::kSyncKeepEverythingSynced));
-
-  GetClient(0)->DisableSyncForDatatype(syncer::PREFERENCES);
-  GetClient(1)->EnableSyncForDatatype(syncer::PREFERENCES);
-  GetClient(0)->DisableSyncForDatatype(syncer::AUTOFILL);
-  GetClient(1)->EnableSyncForDatatype(syncer::AUTOFILL);
-  GetClient(0)->DisableSyncForDatatype(syncer::BOOKMARKS);
-  GetClient(1)->EnableSyncForDatatype(syncer::BOOKMARKS);
-  GetClient(0)->DisableSyncForDatatype(syncer::EXTENSIONS);
-  GetClient(1)->EnableSyncForDatatype(syncer::EXTENSIONS);
-  GetClient(0)->DisableSyncForDatatype(syncer::THEMES);
-  GetClient(1)->EnableSyncForDatatype(syncer::THEMES);
-
-  ASSERT_TRUE(AwaitQuiescence());
-
-  ASSERT_FALSE(BooleanPrefMatches(sync_driver::prefs::kSyncPreferences));
-  ASSERT_FALSE(BooleanPrefMatches(sync_driver::prefs::kSyncBookmarks));
-  ASSERT_FALSE(BooleanPrefMatches(sync_driver::prefs::kSyncThemes));
-  ASSERT_FALSE(BooleanPrefMatches(sync_driver::prefs::kSyncExtensions));
-  ASSERT_FALSE(BooleanPrefMatches(sync_driver::prefs::kSyncAutofill));
-  ASSERT_FALSE(
-      BooleanPrefMatches(sync_driver::prefs::kSyncKeepEverythingSynced));
-}
-
-// TCM ID - 3666296.
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, kShowBookmarkBar) {

[rlarocque, 2014/06/20 20:03:35]

Another boolean test.

-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kShowBookmarkBar));
+  ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage));
+  EXPECT_EQ("http://www.google.com/0", GetPrefs(0)->GetString(prefs::kHomePage));
 
-  ChangeBooleanPref(0, prefs::kShowBookmarkBar);
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kShowBookmarkBar));
+  ChangeStringPref(1, prefs::kHomePage, "http://www.google.com/1");
+  ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage));
+  EXPECT_EQ("http://www.google.com/1", GetPrefs(0)->GetString(prefs::kHomePage));
 }
 
-// TCM ID - 3611311.
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, kCheckDefaultBrowser) {

[rlarocque, 2014/06/20 20:03:35]

The first of the non-syncable boolean pref tests.  Renamed and refactored.

-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, UnsyncableBooleanPref) {
+  ASSERT_TRUE(SetupSync());
   DisableVerifier();
+  ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage));
+  ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kCheckDefaultBrowser));
 
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kCheckDefaultBrowser));
-
+  // This pref is not syncable.
   ChangeBooleanPref(0, prefs::kCheckDefaultBrowser);
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_FALSE(BooleanPrefMatches(prefs::kCheckDefaultBrowser));
-}
-
-// TCM ID - 3628298.
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, kHomePage) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_TRUE(StringPrefMatches(prefs::kHomePage));
 
+  // This pref is syncable.
   ChangeStringPref(0, prefs::kHomePage, "http://news.google.com");
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(StringPrefMatches(prefs::kHomePage));
-}
-
-// TCM ID - 7297269.

[rlarocque, 2014/06/20 20:03:35]

More boolean tests.

-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, kShowHomeButton) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
-
-  ChangeBooleanPref(0, prefs::kShowHomeButton);
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
-}
-
-// TCM ID - 3710285.
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, kEnableTranslate) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kEnableTranslate));
 
-  ChangeBooleanPref(0, prefs::kEnableTranslate);
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kEnableTranslate));
+  // Wait until the syncable pref is synced, then expect that the non-syncable
+  // one is still out of sync.
+  ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage));
+  ASSERT_FALSE(BooleanPrefMatches(prefs::kCheckDefaultBrowser));
 }
 
-// TCM ID - 3664293.
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, kAutofillEnabled) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_TRUE(BooleanPrefMatches(autofill::prefs::kAutofillEnabled));
+IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, StringPref) {
+  ASSERT_TRUE(SetupSync());
+  ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage));
 
-  ChangeBooleanPref(0, autofill::prefs::kAutofillEnabled);
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(BooleanPrefMatches(autofill::prefs::kAutofillEnabled));
+  ChangeStringPref(0, prefs::kHomePage, "http://news.google.com");
+  ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage));
 }
 
-// TCM ID - 3632259.
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,

[rlarocque, 2014/06/20 20:03:35]

Kept this as ComplexPrefs, since the overall scenario is sort of interesting. 
It also includes an integer pref, which we haven't covered yet.

-                       kURLsToRestoreOnStartup) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_TRUE(IntegerPrefMatches(prefs::kRestoreOnStartup));
-  ASSERT_TRUE(ListPrefMatches(prefs::kURLsToRestoreOnStartup));
+IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, ComplexPrefs) {
+  ASSERT_TRUE(SetupSync());
+  ASSERT_TRUE(AwaitIntegerPrefMatches(prefs::kRestoreOnStartup));
+  ASSERT_TRUE(AwaitListPrefMatches(prefs::kURLsToRestoreOnStartup));
 
   ChangeIntegerPref(0, prefs::kRestoreOnStartup, 0);
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(IntegerPrefMatches(prefs::kRestoreOnStartup));
+  ASSERT_TRUE(AwaitIntegerPrefMatches(prefs::kRestoreOnStartup));
 
   base::ListValue urls;
   urls.Append(base::Value::CreateStringValue("http://www.google.com/"));
   urls.Append(base::Value::CreateStringValue("http://www.flickr.com/"));
   ChangeIntegerPref(0, prefs::kRestoreOnStartup, 4);
   ChangeListPref(0, prefs::kURLsToRestoreOnStartup, urls);
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(IntegerPrefMatches(prefs::kRestoreOnStartup));
-  ASSERT_TRUE(ListPrefMatches(prefs::kURLsToRestoreOnStartup));
-}
-
-// TCM ID - 3684287.
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, kRestoreOnStartup) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_TRUE(IntegerPrefMatches(prefs::kRestoreOnStartup));
-
-  ChangeIntegerPref(0, prefs::kRestoreOnStartup, 1);
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(IntegerPrefMatches(prefs::kRestoreOnStartup));
-}
-
-// TCM ID - 3703314.
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, Privacy) {

[rlarocque, 2014/06/20 20:03:35]

Tests a bunch of boolean prefs.  Deleted.

-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  DisableVerifier();
-
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kAlternateErrorPagesEnabled));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kSearchSuggestEnabled));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kNetworkPredictionEnabled));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kSafeBrowsingEnabled));
-
-  ChangeBooleanPref(0, prefs::kAlternateErrorPagesEnabled);
-  ChangeBooleanPref(0, prefs::kSearchSuggestEnabled);
-  ChangeBooleanPref(0, prefs::kNetworkPredictionEnabled);
-  ChangeBooleanPref(0, prefs::kSafeBrowsingEnabled);
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kAlternateErrorPagesEnabled));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kSearchSuggestEnabled));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kNetworkPredictionEnabled));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kSafeBrowsingEnabled));
-}
-
-// TCM ID - 3649279.
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, ClearData) {

[rlarocque, 2014/06/20 20:03:35]

Tests a different bunch of boolean prefs.  Aslo deleted.

-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  DisableVerifier();
-
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteBrowsingHistory));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteDownloadHistory));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteCache));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteCookies));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kDeletePasswords));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteFormData));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteHostedAppsData));
-
-  ChangeBooleanPref(0, prefs::kDeleteBrowsingHistory);
-  ChangeBooleanPref(0, prefs::kDeleteDownloadHistory);
-  ChangeBooleanPref(0, prefs::kDeleteCache);
-  ChangeBooleanPref(0, prefs::kDeleteCookies);
-  ChangeBooleanPref(0, prefs::kDeletePasswords);
-  ChangeBooleanPref(0, prefs::kDeleteFormData);
-  ChangeBooleanPref(0, prefs::kDeleteHostedAppsData);
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteBrowsingHistory));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteDownloadHistory));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteCache));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteCookies));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kDeletePasswords));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteFormData));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteHostedAppsData));
-}
-
-// TCM ID - 3686300.
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,

[rlarocque, 2014/06/20 20:03:35]

The following deleted tests are each testing a single string or boolean pref.

-                       kWebKitUsesUniversalDetector) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kWebKitUsesUniversalDetector));
-
-  ChangeBooleanPref(0, prefs::kWebKitUsesUniversalDetector);
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kWebKitUsesUniversalDetector));
-}
-
-// TCM ID - 3673298.
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, kDefaultCharset) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_TRUE(StringPrefMatches(prefs::kDefaultCharset));
-
-  ChangeStringPref(0, prefs::kDefaultCharset, "Thai");
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(StringPrefMatches(prefs::kDefaultCharset));
-}
-
-// TCM ID - 3653296.
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
-                       kBlockThirdPartyCookies) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kBlockThirdPartyCookies));
-
-  ChangeBooleanPref(0, prefs::kBlockThirdPartyCookies);
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kBlockThirdPartyCookies));
-}
-
-// TCM ID - 7297279.
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
-                       kClearSiteDataOnExit) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kClearSiteDataOnExit));
-
-  ChangeBooleanPref(0, prefs::kClearSiteDataOnExit);
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kClearSiteDataOnExit));
-}
-
-// TCM ID - 7306184.
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
-                       kSafeBrowsingEnabled) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kSafeBrowsingEnabled));
-
-  ChangeBooleanPref(0, prefs::kSafeBrowsingEnabled);
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kSafeBrowsingEnabled));
+  ASSERT_TRUE(AwaitIntegerPrefMatches(prefs::kRestoreOnStartup));
+  ASSERT_TRUE(AwaitListPrefMatches(prefs::kURLsToRestoreOnStartup));
 }
 
-// TCM ID - 3624302.
 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
                        kAutofillAuxiliaryProfilesEnabled) {

[rlarocque, 2014/06/20 20:03:35]

This one seemed kind of interesting because of the #ifdef.  Kept.

-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+  ASSERT_TRUE(SetupSync());
   DisableVerifier();
 
-  ASSERT_TRUE(
-      BooleanPrefMatches(autofill::prefs::kAutofillAuxiliaryProfilesEnabled));
+  ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage));
+  ASSERT_TRUE(AwaitBooleanPrefMatches(
+      autofill::prefs::kAutofillAuxiliaryProfilesEnabled));
 
+  // This pref may be syncable.
   ChangeBooleanPref(0, autofill::prefs::kAutofillAuxiliaryProfilesEnabled);
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+
+  // This pref is always syncable.
+  ChangeStringPref(0, prefs::kHomePage, "http://news.google.com");
+
+  // Wait for the syncable pref to propagate.
+  ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage));
 
   // kAutofillAuxiliaryProfilesEnabled is only synced on Mac and Android.
 #if defined(OS_MACOSX) || defined(OS_ANDROID)
@@ -400,220 +125,32 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
 #endif  // defined(OS_MACOSX) || defined(OS_ANDROID)
 }
 
-// TCM ID - 3717298.
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, kPromptForDownload) {

[rlarocque, 2014/06/20 20:03:35]

More deleted boolean and string pref tests follow.

-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kPromptForDownload));
-
-  ChangeBooleanPref(0, prefs::kPromptForDownload);
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kPromptForDownload));
-}
-
-// TCM ID - 3729263.
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
-                       kPrefTranslateLanguageBlacklist) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kEnableTranslate));
-
-  scoped_ptr<TranslatePrefs> translate_client0_prefs(
-      ChromeTranslateClient::CreateTranslatePrefs(GetPrefs(0)));
-  scoped_ptr<TranslatePrefs> translate_client1_prefs(
-      ChromeTranslateClient::CreateTranslatePrefs(GetPrefs(1)));
-  ASSERT_FALSE(translate_client0_prefs->IsBlockedLanguage("fr"));
-  translate_client0_prefs->BlockLanguage("fr");
-  ASSERT_TRUE(translate_client0_prefs->IsBlockedLanguage("fr"));
-
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(translate_client1_prefs->IsBlockedLanguage("fr"));
-
-  translate_client0_prefs->UnblockLanguage("fr");
-  ASSERT_FALSE(translate_client0_prefs->IsBlockedLanguage("fr"));
-
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_FALSE(translate_client1_prefs->IsBlockedLanguage("fr"));
-}
-
-// TCM ID - 7307195.
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
-                       kPrefTranslateWhitelists) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kEnableTranslate));
-
-  scoped_ptr<TranslatePrefs> translate_client0_prefs(
-      ChromeTranslateClient::CreateTranslatePrefs(GetPrefs(0)));
-  scoped_ptr<TranslatePrefs> translate_client1_prefs(
-      ChromeTranslateClient::CreateTranslatePrefs(GetPrefs(1)));
-  ASSERT_FALSE(translate_client0_prefs->IsLanguagePairWhitelisted("en", "bg"));
-  translate_client0_prefs->WhitelistLanguagePair("en", "bg");
-  ASSERT_TRUE(translate_client0_prefs->IsLanguagePairWhitelisted("en", "bg"));
-
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(translate_client1_prefs->IsLanguagePairWhitelisted("en", "bg"));
-
-  translate_client0_prefs->RemoveLanguagePairFromWhitelist("en", "bg");
-  ASSERT_FALSE(translate_client0_prefs->IsLanguagePairWhitelisted("en", "bg"));
-
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_FALSE(translate_client1_prefs->IsLanguagePairWhitelisted("en", "bg"));
-}
-
-// TCM ID - 3625298.
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
-                       kPrefTranslateSiteBlacklist) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kEnableTranslate));
-
-  GURL url("http://www.google.com");
-  std::string host(url.host());
-  scoped_ptr<TranslatePrefs> translate_client0_prefs(
-      ChromeTranslateClient::CreateTranslatePrefs(GetPrefs(0)));
-  scoped_ptr<TranslatePrefs> translate_client1_prefs(
-      ChromeTranslateClient::CreateTranslatePrefs(GetPrefs(1)));
-  ASSERT_FALSE(translate_client0_prefs->IsSiteBlacklisted(host));
-  translate_client0_prefs->BlacklistSite(host);
-  ASSERT_TRUE(translate_client0_prefs->IsSiteBlacklisted(host));
-
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(translate_client1_prefs->IsSiteBlacklisted(host));
-
-  translate_client0_prefs->RemoveSiteFromBlacklist(host);
-  ASSERT_FALSE(translate_client0_prefs->IsSiteBlacklisted(host));
-
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_FALSE(translate_client1_prefs->IsSiteBlacklisted(host));
-}
-
-// TCM ID - 6515252.
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
-                       kExtensionsUIDeveloperMode) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kExtensionsUIDeveloperMode));
-
-  ChangeBooleanPref(0, prefs::kExtensionsUIDeveloperMode);
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kExtensionsUIDeveloperMode));
-}
-
-// TCM ID - 7583816
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, kAcceptLanguages) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  DisableVerifier();
-  ASSERT_TRUE(StringPrefMatches(prefs::kAcceptLanguages));
-
-  AppendStringPref(0, prefs::kAcceptLanguages, ",ar");
-  AppendStringPref(1, prefs::kAcceptLanguages, ",fr");
-  ASSERT_TRUE(AwaitQuiescence());
-  ASSERT_TRUE(StringPrefMatches(prefs::kAcceptLanguages));
-
-  ChangeStringPref(0, prefs::kAcceptLanguages, "en-US");
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(StringPrefMatches(prefs::kAcceptLanguages));
-
-  ChangeStringPref(0, prefs::kAcceptLanguages, "ar,en-US");
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(StringPrefMatches(prefs::kAcceptLanguages));
-}
-
-// TCM ID - 6473347.
-#if defined(OS_CHROMEOS)
-// Disabled, http://crbug.com/351159 .
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
-                       DISABLED_kTapToClickEnabled) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kTapToClickEnabled));
-
-  ChangeBooleanPref(0, prefs::kTapToClickEnabled);
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kTapToClickEnabled));
-
-  ChangeBooleanPref(1, prefs::kTapToClickEnabled);
-  ASSERT_TRUE(GetClient(1)->AwaitMutualSyncCycleCompletion(GetClient(0)));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kTapToClickEnabled));
-}
-#endif  // OS_CHROMEOS
-
-// TCM ID - 6458824.
-#if defined(OS_CHROMEOS)
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, kEnableAutoScreenLock) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kEnableAutoScreenLock));
-
-  ChangeBooleanPref(0, prefs::kEnableAutoScreenLock);
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kEnableAutoScreenLock));
-
-  ChangeBooleanPref(1, prefs::kEnableAutoScreenLock);
-  ASSERT_TRUE(GetClient(1)->AwaitMutualSyncCycleCompletion(GetClient(0)));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kEnableAutoScreenLock));
-}
-#endif  // OS_CHROMEOS
-
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
-                       SingleClientEnabledEncryption) {

[rlarocque, 2014/06/20 20:03:35]

As I explained in the previous code review
(https://codereview.chromium.org/315823002/), these encryption tests are of
questionable value.  I've refactored and kept two of them.

-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
-  ASSERT_TRUE(EnableEncryption(0));
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(IsEncryptionComplete(0));
-  ASSERT_TRUE(IsEncryptionComplete(1));
-}
-
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
-                       SingleClientEnabledEncryptionAndChanged) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage));
-
-  ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage);
-  ASSERT_TRUE(EnableEncryption(0));
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(IsEncryptionComplete(0));
-  ASSERT_TRUE(IsEncryptionComplete(1));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage));
-}
-
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
-                       BothClientsEnabledEncryption) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
-  ASSERT_TRUE(EnableEncryption(0));
-  ASSERT_TRUE(EnableEncryption(1));
-  ASSERT_TRUE(AwaitQuiescence());
-  ASSERT_TRUE(IsEncryptionComplete(0));
-  ASSERT_TRUE(IsEncryptionComplete(1));
-}
-
 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
                        SingleClientEnabledEncryptionBothChanged) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage));
-  ASSERT_TRUE(StringPrefMatches(prefs::kHomePage));
+  ASSERT_TRUE(SetupSync());
+  ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kHomePageIsNewTabPage));
+  ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage));
 
   ASSERT_TRUE(EnableEncryption(0));
   ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage);
   ChangeStringPref(1, prefs::kHomePage, "http://www.google.com/1");
-  ASSERT_TRUE(AwaitQuiescence());
-  ASSERT_TRUE(IsEncryptionComplete(0));
-  ASSERT_TRUE(IsEncryptionComplete(1));
-  ASSERT_TRUE(BooleanPrefMatches(
-      prefs::kHomePageIsNewTabPage));
-  ASSERT_TRUE(StringPrefMatches(prefs::kHomePage));
+  ASSERT_TRUE(AwaitEncryptionComplete(0));
+  ASSERT_TRUE(AwaitEncryptionComplete(1));
+  ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage));
+  ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage));
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
-                       SingleClientEnabledEncryptionAndChangedMultipleTimes) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage));
+                       BothClientsEnabledEncryptionAndChangedMultipleTimes) {
+  ASSERT_TRUE(SetupSync());
+  ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kHomePageIsNewTabPage));
 
   ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage);
   ASSERT_TRUE(EnableEncryption(0));
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(IsEncryptionComplete(0));
-  ASSERT_TRUE(IsEncryptionComplete(1));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage));
+  ASSERT_TRUE(EnableEncryption(1));
+  ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kHomePageIsNewTabPage));
 
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
+  ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kShowHomeButton));
   ChangeBooleanPref(0, prefs::kShowHomeButton);
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
+  ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kShowHomeButton));
 }