themes: Remove usage of TOOLKIT_GTK define.

chrome/browser/themes/theme_syncable_service_unittest.cc

Index: chrome/browser/themes/theme_syncable_service_unittest.cc
diff --git a/chrome/browser/themes/theme_syncable_service_unittest.cc b/chrome/browser/themes/theme_syncable_service_unittest.cc
index 7a772875e29fc2b6c2265464378aaeb2fc55bb55..fb73391b84cb77f21897af2f4ebe29f2da7e553c 100644
--- a/chrome/browser/themes/theme_syncable_service_unittest.cc
+++ b/chrome/browser/themes/theme_syncable_service_unittest.cc
@@ -568,9 +568,8 @@ TEST_F(ThemeSyncableServiceTest, RestoreSystemThemeBitWhenChangeToCustomTheme) {
   EXPECT_TRUE(change_specifics.use_system_theme_by_default());
 }
 
-#if defined(TOOLKIT_GTK)
 TEST_F(ThemeSyncableServiceTest,
-       GtkUpdateSystemThemeBitWhenChangeBetweenSystemAndDefault) {
+       DISABLED_GtkUpdateSystemThemeBitWhenChangeBetweenSystemAndDefault) {

[tfarina, 2015/10/05 23:32:02]

Is this OK? I was not sure what to use instead.

   // Initialize to use native theme.
   fake_theme_service_->UseSystemTheme();
   fake_theme_service_->MarkClean();
@@ -613,9 +612,7 @@ TEST_F(ThemeSyncableServiceTest,
                   .theme()
                   .use_system_theme_by_default());
 }
-#endif
 
-#ifndef TOOLKIT_GTK
 TEST_F(ThemeSyncableServiceTest,
        NonGtkPreserveSystemThemeBitWhenChangeToDefaultTheme) {
   // Set up theme service to use default theme.
@@ -652,7 +649,6 @@ TEST_F(ThemeSyncableServiceTest,
   EXPECT_FALSE(change_specifics.use_custom_theme());
   EXPECT_TRUE(change_specifics.use_system_theme_by_default());
 }
-#endif
 
 TEST_F(PolicyInstalledThemeTest, InstallThemeByPolicy) {
   // Set up theme service to use custom theme that was installed by policy.