Move themes garbage-collection out of shutdown code.

chrome/test/live_sync/single_client_live_themes_sync_test.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/test/live_sync/live_themes_sync_test.h"
 
 #include "base/basictypes.h"
 #include "chrome/common/extensions/extension.h"
 
 class SingleClientLiveThemesSyncTest : public LiveThemesSyncTest {
@@ skipping 20 matching lines @@
   ASSERT_EQ(GetTheme(0), GetCustomTheme(GetProfile(0)));
   ASSERT_EQ(GetTheme(0), GetCustomTheme(verifier()));
 
   ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion(
       "Waiting for custom themes change."));
 
   ASSERT_EQ(GetTheme(0), GetCustomTheme(GetProfile(0)));
   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));
   SetTheme(verifier(), GetTheme(0));
   ASSERT_FALSE(UsingNativeTheme(GetProfile(0)));
   ASSERT_FALSE(UsingNativeTheme(verifier()));
 
   ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion(
       "Waiting for custom themes change."));
 
   GetProfile(0)->SetNativeTheme();
   verifier()->SetNativeTheme();
   ASSERT_TRUE(UsingNativeTheme(GetProfile(0)));
   ASSERT_TRUE(UsingNativeTheme(verifier()));
 
   ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion(
       "Waiting for native themes change."));
 
   ASSERT_TRUE(UsingNativeTheme(GetProfile(0)));
   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));
   SetTheme(verifier(), GetTheme(0));
   ASSERT_FALSE(UsingDefaultTheme(GetProfile(0)));
   ASSERT_FALSE(UsingDefaultTheme(verifier()));
 
   ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion(
       "Waiting for custom themes change."));
 
   GetProfile(0)->ClearTheme();
   verifier()->ClearTheme();
   ASSERT_TRUE(UsingDefaultTheme(GetProfile(0)));
   ASSERT_TRUE(UsingDefaultTheme(verifier()));
 
   ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion(
       "Waiting for native themes change."));
 
   ASSERT_TRUE(UsingDefaultTheme(GetProfile(0)));
   ASSERT_TRUE(UsingDefaultTheme(verifier()));
 }