sync: Refactor TwoClientPreferencesSyncTest

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

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_PREFERENCES_HELPER_H_
 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_PREFERENCES_HELPER_H_
 
 #include "base/files/file_path.h"
 #include "base/values.h"
 
@@ skipping 29 matching lines @@
 // |verifier| if DisableVerifier() hasn't been called.
 void ChangeDoublePref(int index, const char* pref_name, double new_value);
 
 // Changes the value of the string preference with name |pref_name| in the
 // profile with index |index| to |new_value|. Also changes its value in
 // |verifier| if DisableVerifier() hasn't been called.
 void ChangeStringPref(int index,
                       const char* pref_name,
                       const std::string& new_value);
 
-// Modifies the value of the string preference with name |pref_name| in the
-// profile with index |index| by appending |append_value| to its current
-// value. Also changes its value in |verifier| if DisableVerifier() hasn't
-// been called.
-void AppendStringPref(int index,
-                      const char* pref_name,
-                      const std::string& append_value);
-
 // Changes the value of the file path preference with name |pref_name| in the
 // profile with index |index| to |new_value|. Also changes its value in
 // |verifier| if DisableVerifier() hasn't been called.
 void ChangeFilePathPref(int index,
                         const char* pref_name,
                         const base::FilePath& new_value);
 
 // Changes the value of the list preference with name |pref_name| in the
 // profile with index |index| to |new_value|. Also changes its value in
 // |verifier| if DisableVerifier() hasn't been called.
@@ skipping 33 matching lines @@
 
 // Used to verify that the list preference with name |pref_name| has the
 // same value across all profiles. Also checks |verifier| if DisableVerifier()
 // hasn't been called.
 bool ListPrefMatches(const char* pref_name) WARN_UNUSED_RESULT;
 
 // This is the version of ListPrefMatches that waits for the preference list
 // to match in all profiles. Returns false if this operation times out.
 bool AwaitListPrefMatches(const char* pref_name) WARN_UNUSED_RESULT;
 
+// Blocks the test until the specified pref matches on all relevant clients or
+// a timeout occurs.  Returns false if it returns because of a timeout.
+bool AwaitBooleanPrefMatches(const char* pref_name) WARN_UNUSED_RESULT;
+
+// Blocks the test until the specified pref matches on all relevant clients or
+// a timeout occurs.  Returns false if it returns because of a timeout.
+bool AwaitIntegerPrefMatches(const char* pref_name) WARN_UNUSED_RESULT;
+
+// Blocks the test until the specified pref matches on all relevant clients or
+// a timeout occurs.  Returns false if it returns because of a timeout.
+bool AwaitStringPrefMatches(const char* pref_name) WARN_UNUSED_RESULT;
+
 }  // namespace preferences_helper
 
 #endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_PREFERENCES_HELPER_H_