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 41 matching lines @@
     FILE_PATH_LITERAL("c:\\foo");
 #elif defined(OS_POSIX)
 const base::FilePath::CharType kExtensionFilePath[] = FILE_PATH_LITERAL("/oo");
 #endif
 
 class FakeThemeService : public ThemeService {
  public:
   FakeThemeService() :
     using_system_theme_(false),
     using_default_theme_(false),
+    distinct_from_default_theme_(false),
     theme_extension_(NULL),
     is_dirty_(false) {}
 
   // ThemeService implementation
   void SetTheme(const extensions::Extension* extension) override {
     is_dirty_ = true;
     theme_extension_ = extension;
     using_system_theme_ = false;
     using_default_theme_ = false;
   }
 
   void UseDefaultTheme() override {
     is_dirty_ = true;
     using_default_theme_ = true;
     using_system_theme_ = false;
     theme_extension_ = NULL;
   }
 
   void UseSystemTheme() override {
     is_dirty_ = true;
     using_system_theme_ = true;
     using_default_theme_ = false;
     theme_extension_ = NULL;
   }
 
+  bool IsSystemThemeDistinctFromDefaultTheme() const override {
+    return distinct_from_default_theme_;
+  }

[pkotwicz, 2015/10/28 15:02:11]

Nit: New line

[tfarina, 2015/10/28 18:55:13]

Done.

+  void set_distinct_from_default_theme(bool is_distinct) {
+    distinct_from_default_theme_ = is_distinct;
+  }
+
   bool UsingDefaultTheme() const override { return using_default_theme_; }
 
   bool UsingSystemTheme() const override { return using_system_theme_; }
 
   string GetThemeID() const override {
     if (theme_extension_.get())
       return theme_extension_->id();
     else
       return std::string();
   }
 
   const extensions::Extension* theme_extension() const {
     return theme_extension_.get();
   }
 
   bool is_dirty() const {
     return is_dirty_;
   }
 
   void MarkClean() {
     is_dirty_ = false;
   }
 
  private:
   bool using_system_theme_;
   bool using_default_theme_;
+  bool distinct_from_default_theme_;
   scoped_refptr<const extensions::Extension> theme_extension_;
   bool is_dirty_;
 };
 
 scoped_ptr<KeyedService> BuildMockThemeService(
     content::BrowserContext* profile) {
   return make_scoped_ptr(new FakeThemeService);
 }
 
 scoped_refptr<extensions::Extension> MakeThemeExtension(
@@ skipping 438 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) {
+TEST_F(ThemeSyncableServiceTest, DistinctSystemTheme) {
+  fake_theme_service_->set_distinct_from_default_theme(true);
+
   // 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) {
+TEST_F(ThemeSyncableServiceTest, SystemThemeSameAsDefaultTheme) {
+  fake_theme_service_->set_distinct_from_default_theme(false);
+
   // 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);
   theme_specifics.set_custom_theme_name(kCustomThemeUrl);
   theme_specifics.set_use_system_theme_by_default(true);
@@ skipping 14 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());
 }