sync: Refactor TwoClientPreferencesSyncTest

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

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_
 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 181 matching lines @@
   // Default is to return true.  Test should override this if they require
   // different behavior.
   virtual bool TestUsesSelfNotifications();
 
   // Kicks off encryption for profile |index|.
   bool EnableEncryption(int index);
 
   // Checks if encryption is complete for profile |index|.
   bool IsEncryptionComplete(int index);
 
+  // Waits until IsEncryptionComplete returns true or a timeout is reached.
+  bool AwaitEncryptionComplete(int index);
+
   // Blocks until all sync clients have completed their mutual sync cycles.
   // Returns true if a quiescent state was successfully reached.
   bool AwaitQuiescence();
 
   // Returns true if the server being used supports controlling
   // notifications.
   bool ServerSupportsNotificationControl() const;
 
   // Disable notifications on the server.  This operation is available
   // only if ServerSupportsNotificationControl() returned true.
@@ skipping 216 matching lines @@
   // Fake URLFetcher factory used to mock out GAIA signin.
   scoped_ptr<net::FakeURLFetcherFactory> fake_factory_;
 
   // The URLFetcherImplFactory instance used to instantiate |fake_factory_|.
   scoped_ptr<net::URLFetcherImplFactory> factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncTest);
 };
 
 #endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_