sync: Refactor TwoClientPreferencesSyncTest

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

Index: chrome/browser/sync/test/integration/sync_test.cc
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
index 358c72cac856d5630827fba5dfa1ffd0b416bac8..22b0a8c9fc400c3bb42f4cc2eae423162ab21dbc 100644
--- a/chrome/browser/sync/test/integration/sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -835,17 +835,20 @@ bool SyncTest::EnableEncryption(int index) {
   bool sync_everything = synced_datatypes.Equals(syncer::ModelTypeSet::All());
   service->OnUserChoseDatatypes(sync_everything, synced_datatypes);
 
-  // Wait some time to let the enryption finish.
-  EncryptionChecker checker(service);
-  checker.Wait();
-
-  return !checker.TimedOut();
+  return AwaitEncryptionComplete(index);
 }
 
 bool SyncTest::IsEncryptionComplete(int index) {
   return ::IsEncryptionComplete(GetClient(index)->service());
 }
 
+bool SyncTest::AwaitEncryptionComplete(int index) {
+  ProfileSyncService* service = GetClient(index)->service();
+  EncryptionChecker checker(service);
+  checker.Wait();
+  return !checker.TimedOut();
+}
+
 bool SyncTest::AwaitQuiescence() {
   return ProfileSyncServiceHarness::AwaitQuiescence(clients());
 }