themes: Remove usage of TOOLKIT_GTK define.

chrome/browser/themes/theme_syncable_service_unittest.cc

 // 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.
 
 #include "chrome/browser/themes/theme_syncable_service.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 36 matching lines @@
 static const char kCustomThemeName[] = "name";
 static const char kCustomThemeUrl[] = "http://update.url/foo";
 
 #if defined(OS_WIN)
 const base::FilePath::CharType kExtensionFilePath[] =
     FILE_PATH_LITERAL("c:\\foo");
 #elif defined(OS_POSIX)
 const base::FilePath::CharType kExtensionFilePath[] = FILE_PATH_LITERAL("/oo");
 #endif
 
 class FakeThemeService : public ThemeService {

[pkotwicz, 2015/10/06 16:56:34]

FakeThemeService should override
ThemeService::IsSystemThemeDistinctFromDefaultTheme() and provide a way for
tests to set the returned value.
(ThemeServiceAuraX11::::IsSystemThemeDistinctFromDefaultTheme() returns true)

Both of tests: GtkUpdateSystemThemeBitWhenChangeBetweenSystemAndDefault and
NonGtkPreserveSystemThemeBitWhenChangeToDefaultTheme should be enabled all of
the time given that the tests can just set the return value of
ThemeService::IsSystemThemeDistinctFromDefaultTheme().

I would recommend renaming the tests:
GtkUpdateSystemThemeBitWhenChangeBetweenSystemAndDefault -> DistinctSystemTheme
NonGtkPreserveSystemThemeBitWhenChangeToDefaultTheme->
SystemThemeSameAsDefaultTheme

[tfarina, 2015/10/25 02:43:24]

Done.

  public:
   FakeThemeService() :
     using_system_theme_(false),
     using_default_theme_(false),
     theme_extension_(NULL),
     is_dirty_(false) {}
 
   // ThemeService implementation
   void SetTheme(const extensions::Extension* extension) override {
     is_dirty_ = true;
@@ skipping 493 matching lines @@
   // use_system_theme_by_default bit should be preserved.
   fake_theme_service_->SetTheme(theme_extension_.get());
   theme_sync_service_->OnThemeChange();
   const syncer::SyncChangeList& changes = fake_change_processor_->changes();
   EXPECT_EQ(1u, changes.size());
   const sync_pb::ThemeSpecifics& change_specifics =
       changes[0].sync_data().GetSpecifics().theme();
   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();
   sync_pb::ThemeSpecifics theme_specifics;
   theme_specifics.set_use_system_theme_by_default(true);
   syncer::SyncError error =
       theme_sync_service_
           ->MergeDataAndStartSyncing(
                 syncer::THEMES,
                 MakeThemeDataList(theme_specifics),
@@ skipping 22 matching lines @@
   changes.clear();
   fake_theme_service_->UseSystemTheme();
   theme_sync_service_->OnThemeChange();
   EXPECT_EQ(1u, changes.size());
   EXPECT_TRUE(changes[0]
                   .sync_data()
                   .GetSpecifics()
                   .theme()
                   .use_system_theme_by_default());
 }
-#endif
 
-#ifndef TOOLKIT_GTK
 TEST_F(ThemeSyncableServiceTest,
        NonGtkPreserveSystemThemeBitWhenChangeToDefaultTheme) {
   // Set up theme service to use default theme.
   fake_theme_service_->UseDefaultTheme();
 
   // Initialize to use custom theme with use_system_theme_by_default set true.
   sync_pb::ThemeSpecifics theme_specifics;
   theme_specifics.set_use_custom_theme(true);
   theme_specifics.set_custom_theme_id(theme_extension_->id());
   theme_specifics.set_custom_theme_name(kCustomThemeName);
@@ skipping 16 matching lines @@
   // use_system_theme_by_default bit should be preserved.
   fake_theme_service_->UseDefaultTheme();
   theme_sync_service_->OnThemeChange();
   const syncer::SyncChangeList& changes = fake_change_processor_->changes();
   EXPECT_EQ(1u, changes.size());
   const sync_pb::ThemeSpecifics& change_specifics =
       changes[0].sync_data().GetSpecifics().theme();
   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.
   fake_theme_service_->SetTheme(theme_extension_.get());
 
   syncer::SyncDataList data_list =
       theme_sync_service_->GetAllSyncData(syncer::THEMES);
 
   ASSERT_EQ(0u, data_list.size());
 }