Remove the enable_themes build flag and define.

chrome/browser/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/split_static_library.gni")
 import("//chrome/common/features.gni")
@@ skipping 2265 matching lines @@
       "certificate_manager_model.h",
       "net/nss_context.cc",
       "net/nss_context.h",
       "net/nss_context_chromeos.cc",
       "net/nss_context_linux.cc",
     ]
     if (is_chromeos) {
       sources -= [ "net/nss_context_linux.cc" ]
     }
   }
-  if (enable_themes) {
-    sources += [
-      "sync/glue/theme_data_type_controller.cc",
-      "sync/glue/theme_data_type_controller.h",
-      "themes/browser_theme_pack.cc",
-      "themes/browser_theme_pack.h",
-      "themes/custom_theme_supplier.cc",
-      "themes/custom_theme_supplier.h",
-      "themes/theme_properties.cc",
-      "themes/theme_service.cc",
-      "themes/theme_service.h",
-      "themes/theme_service_factory.cc",
-      "themes/theme_service_factory.h",
-      "themes/theme_service_mac.mm",
-      "themes/theme_syncable_service.cc",
-      "themes/theme_syncable_service.h",
-    ]
-    deps += [ ":theme_properties" ]
-  }
 
   if (enable_basic_printing || enable_print_preview) {
     # Some form of printing support.
     sources += [
       "printing/print_job.cc",
       "printing/print_job.h",
       "printing/print_job_manager.cc",
       "printing/print_job_manager.h",
       "printing/print_job_worker.cc",
       "printing/print_job_worker.h",
@@ skipping 443 matching lines @@
       "speech/extension_api/tts_extension_api_constants.cc",  # Should be moved to extensions section?
       "speech/extension_api/tts_extension_api_constants.h",
       "ssl/ssl_client_auth_observer.cc",
       "ssl/ssl_client_auth_observer.h",
       "status_icons/desktop_notification_balloon.cc",
       "status_icons/desktop_notification_balloon.h",
       "sync/glue/extension_data_type_controller.cc",
       "sync/glue/extension_data_type_controller.h",
       "sync/glue/extension_setting_data_type_controller.cc",
       "sync/glue/extension_setting_data_type_controller.h",
+      "sync/glue/theme_data_type_controller.cc",
+      "sync/glue/theme_data_type_controller.h",
       "sync/sync_ui_util.cc",
       "sync/sync_ui_util.h",
       "task_manager/providers/browser_process_task.cc",
       "task_manager/providers/browser_process_task.h",
       "task_manager/providers/browser_process_task_provider.cc",
       "task_manager/providers/browser_process_task_provider.h",
       "task_manager/providers/child_process_task.cc",
       "task_manager/providers/child_process_task.h",
       "task_manager/providers/child_process_task_provider.cc",
       "task_manager/providers/child_process_task_provider.h",
@@ skipping 48 matching lines @@
       "task_manager/sampling/task_group_sampler.cc",
       "task_manager/sampling/task_group_sampler.h",
       "task_manager/sampling/task_manager_impl.cc",
       "task_manager/sampling/task_manager_impl.h",
       "task_manager/sampling/task_manager_io_thread_helper.cc",
       "task_manager/sampling/task_manager_io_thread_helper.h",
       "task_manager/task_manager_interface.cc",
       "task_manager/task_manager_interface.h",
       "task_manager/task_manager_observer.cc",
       "task_manager/task_manager_observer.h",
+      "themes/browser_theme_pack.cc",
+      "themes/browser_theme_pack.h",
+      "themes/custom_theme_supplier.cc",
+      "themes/custom_theme_supplier.h",
+      "themes/theme_properties.cc",
+      "themes/theme_service.cc",
+      "themes/theme_service.h",
+      "themes/theme_service_factory.cc",
+      "themes/theme_service_factory.h",
+      "themes/theme_service_mac.mm",
+      "themes/theme_syncable_service.cc",
+      "themes/theme_syncable_service.h",
       "upgrade_detector.cc",
       "upgrade_detector.h",
       "usb/usb_chooser_controller.cc",
       "usb/usb_chooser_controller.h",
       "usb/web_usb_chooser_service.cc",
       "usb/web_usb_chooser_service.h",
       "usb/web_usb_detector.cc",
       "usb/web_usb_detector.h",
     ]
     deps += [
+      ":theme_properties",
       "//apps",
       "//chrome/browser/policy:path_parser",
       "//chrome/browser/profile_resetter:profile_reset_report_proto",
       "//chrome/common/importer:interfaces",
       "//components/feedback",
       "//components/web_modal",
       "//device/battery",
       "//net:net_browser_services",
     ]
   }
@@ skipping 812 matching lines @@
       "supervised_user/supervised_user_sync_data_type_controller.cc",
       "supervised_user/supervised_user_sync_data_type_controller.h",
       "supervised_user/supervised_user_url_filter.cc",
       "supervised_user/supervised_user_url_filter.h",
       "supervised_user/supervised_user_whitelist_service.cc",
       "supervised_user/supervised_user_whitelist_service.h",
       "supervised_user/supervised_users.h",
     ]
   }
   if (enable_supervised_users && !is_android) {
-    # TODO(bauerb): This code should be removed (on desktop) once child account
-    # support has launched (https://crbug.com/505443).
     sources += [
+      # TODO(bauerb): The legacy code should be removed (on desktop) once child
+      # account support has launched (https://crbug.com/505443).
       "supervised_user/legacy/custodian_profile_downloader_service.cc",
       "supervised_user/legacy/custodian_profile_downloader_service.h",
       "supervised_user/legacy/custodian_profile_downloader_service_factory.cc",
       "supervised_user/legacy/custodian_profile_downloader_service_factory.h",
       "supervised_user/legacy/permission_request_creator_sync.cc",
       "supervised_user/legacy/permission_request_creator_sync.h",
       "supervised_user/legacy/supervised_user_pref_mapping_service.cc",
       "supervised_user/legacy/supervised_user_pref_mapping_service.h",
       "supervised_user/legacy/supervised_user_pref_mapping_service_factory.cc",
       "supervised_user/legacy/supervised_user_pref_mapping_service_factory.h",
       "supervised_user/legacy/supervised_user_refresh_token_fetcher.cc",
       "supervised_user/legacy/supervised_user_refresh_token_fetcher.h",
       "supervised_user/legacy/supervised_user_registration_utility.cc",
       "supervised_user/legacy/supervised_user_registration_utility.h",
       "supervised_user/legacy/supervised_user_registration_utility_stub.cc",
       "supervised_user/legacy/supervised_user_registration_utility_stub.h",
       "supervised_user/legacy/supervised_user_shared_settings_service.cc",
       "supervised_user/legacy/supervised_user_shared_settings_service.h",
       "supervised_user/legacy/supervised_user_shared_settings_service_factory.cc",
       "supervised_user/legacy/supervised_user_shared_settings_service_factory.h",
       "supervised_user/legacy/supervised_user_shared_settings_update.cc",
       "supervised_user/legacy/supervised_user_shared_settings_update.h",
       "supervised_user/legacy/supervised_user_sync_service.cc",
       "supervised_user/legacy/supervised_user_sync_service.h",
       "supervised_user/legacy/supervised_user_sync_service_factory.cc",
       "supervised_user/legacy/supervised_user_sync_service_factory.h",
       "supervised_user/legacy/supervised_user_sync_service_observer.h",
-    ]
-  }
-  if (enable_supervised_users && enable_themes) {
-    sources += [
       "supervised_user/supervised_user_theme.cc",
       "supervised_user/supervised_user_theme.h",
     ]
   }
   if (enable_supervised_users && !is_android && !is_chromeos) {
     sources += [
       "supervised_user/supervised_user_creation_policy_handler.cc",
       "supervised_user/supervised_user_creation_policy_handler.h",
     ]
   }
@@ skipping 723 matching lines @@
   # linking all of the test support.
   static_library("pepper_cdm_test_constants") {
     testonly = true
     visibility = [ "//chrome/*" ]
     sources = [
       "media/pepper_cdm_test_constants.cc",
       "media/pepper_cdm_test_constants.h",
     ]
   }
 }