Move themes garbage-collection out of shutdown code.

chrome/test/live_sync/two_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 TwoClientLiveThemesSyncTest : public LiveThemesSyncTest {
@@ skipping 25 matching lines @@
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
 
   ASSERT_EQ(GetTheme(0), GetCustomTheme(GetProfile(0)));
   // TODO(akalin): Add functions to simulate when a pending extension
   // is installed as well as when a pending extension fails to
   // install.
   ASSERT_TRUE(ExtensionIsPendingInstall(GetProfile(1), GetTheme(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(TwoClientLiveThemesSyncTest, FAILS_NativeTheme) {
-#else
 IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, NativeTheme) {
-#endif
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   SetTheme(GetProfile(0), GetTheme(0));
   SetTheme(GetProfile(1), GetTheme(0));
   SetTheme(verifier(), GetTheme(0));
 
   ASSERT_TRUE(AwaitQuiescence());
 
   GetProfile(0)->SetNativeTheme();
   verifier()->SetNativeTheme();
   ASSERT_TRUE(UsingNativeTheme(GetProfile(0)));
   ASSERT_FALSE(UsingNativeTheme(GetProfile(1)));
   ASSERT_TRUE(UsingNativeTheme(verifier()));
 
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
 
   ASSERT_TRUE(UsingNativeTheme(GetProfile(0)));
   ASSERT_TRUE(UsingNativeTheme(GetProfile(1)));
   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(TwoClientLiveThemesSyncTest, FAILS_DefaultTheme) {
-#else
 IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, DefaultTheme) {
-#endif
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   SetTheme(GetProfile(0), GetTheme(0));
   SetTheme(GetProfile(1), GetTheme(0));
   SetTheme(verifier(), GetTheme(0));
 
   ASSERT_TRUE(AwaitQuiescence());
 
   GetProfile(0)->ClearTheme();
   verifier()->ClearTheme();
@@ skipping 73 matching lines @@
   bool using_theme_0 =
       (GetCustomTheme(GetProfile(0)) == GetTheme(0)) &&
       HasOrWillHaveCustomTheme(GetProfile(1), GetTheme(0));
   bool using_theme_1 =
       HasOrWillHaveCustomTheme(GetProfile(0), GetTheme(1)) &&
       (GetCustomTheme(GetProfile(1)) == GetTheme(1));
 
   // Equivalent to using_theme_0 xor using_theme_1.
   ASSERT_NE(using_theme_0, using_theme_1);
 }