Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(661)

Unified Diff: chrome/test/live_sync/single_client_live_themes_sync_test.cc

Issue 4957005: Move themes garbage-collection out of shutdown code. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/test/live_sync/single_client_live_themes_sync_test.cc
diff --git a/chrome/test/live_sync/single_client_live_themes_sync_test.cc b/chrome/test/live_sync/single_client_live_themes_sync_test.cc
index 0b885562b9e9159a8c13bab8a3a63d90794f4c64..a8f92e4fef13cdb88fd2374cf8a9f81a27bbf7a1 100644
--- a/chrome/test/live_sync/single_client_live_themes_sync_test.cc
+++ b/chrome/test/live_sync/single_client_live_themes_sync_test.cc
@@ -38,12 +38,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientLiveThemesSyncTest, CustomTheme) {
ASSERT_EQ(GetTheme(0), GetCustomTheme(verifier()));
}
-// TODO(sync): Remove FAILS_ annotation after http://crbug.com/63285 is fixed.
-#if defined(OS_MACOSX)
-IN_PROC_BROWSER_TEST_F(SingleClientLiveThemesSyncTest, FAILS_NativeTheme) {
-#else
IN_PROC_BROWSER_TEST_F(SingleClientLiveThemesSyncTest, NativeTheme) {
-#endif
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
SetTheme(GetProfile(0), GetTheme(0));
@@ -66,12 +61,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientLiveThemesSyncTest, NativeTheme) {
ASSERT_TRUE(UsingNativeTheme(verifier()));
}
-// TODO(sync): Remove FAILS_ annotation after http://crbug.com/63285 is fixed.
-#if defined(OS_MACOSX)
-IN_PROC_BROWSER_TEST_F(SingleClientLiveThemesSyncTest, FAILS_DefaultTheme) {
-#else
IN_PROC_BROWSER_TEST_F(SingleClientLiveThemesSyncTest, DefaultTheme) {
-#endif
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
SetTheme(GetProfile(0), GetTheme(0));

Powered by Google App Engine
This is Rietveld 408576698