sync: Refactor themes sync integration tests

chrome/browser/sync/test/integration/themes_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_THEMES_HELPER_H_
 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_THEMES_HELPER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 17 matching lines @@
 bool UsingDefaultTheme(Profile* profile) WARN_UNUSED_RESULT;
 
 // Returns true iff |profile| is using the system theme.
 bool UsingSystemTheme(Profile* profile) WARN_UNUSED_RESULT;
 
 // Returns true iff a theme with the given ID is pending install in
 // |profile|.
 bool ThemeIsPendingInstall(
     Profile* profile, const std::string& id) WARN_UNUSED_RESULT;
 
-// Returns true iff |profile|'s current theme is the given
-// custom theme or if the given theme is pending install.
-bool HasOrWillHaveCustomTheme(
-    Profile* profile, const std::string& id) WARN_UNUSED_RESULT;
-
 // Sets |profile| to use the custom theme with the given index.
 void UseCustomTheme(Profile* profile, int index);
 
 // Sets |profile| to use the default theme.
 void UseDefaultTheme(Profile* profile);
 
 // Sets |profile| to use the system theme.
 void UseSystemTheme(Profile* profile);
 
+// Waits until |theme| is pending for install on |profile|.
+// Returns false in case of timeout.
+bool AwaitThemeIsPendingInstall(Profile* profile, const std::string& theme);
+
+// Waits until |profile| is using the system theme.
+// Returns false in case of timeout.
+bool AwaitUsingSystemTheme(Profile* profile);
+
+// Waits until |profile| is using the default theme.
+// Returns false in case of timeout.
+bool AwaitUsingDefaultTheme(Profile* profile);
+
 }  // namespace themes_helper
 
 #endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_THEMES_HELPER_H_