Make //chromeos/settings a component

This includes some deps cleanup of //chromeos.

For explicit DEPS extraction:
TBR=sky@chromium.org

Bug: 918682
Change-Id: I551c9a78284e86aef229f7c12e9b8611d4514c07
Reviewed-on: https://chromium-review.googlesource.com/c/1405968
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: A Olsen <olsen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#622052}

ash/BUILD.gn

@@ -1378,6 +1378,7 @@ component("ash") {
     "//chromeos/services/assistant/public:feature_flags",
     "//chromeos/services/assistant/public/mojom",
     "//chromeos/services/multidevice_setup/public/mojom",
+    "//chromeos/settings",
     "//chromeos/strings",
     "//components/account_id",
     "//components/device_event_log",

chrome/browser/chromeos/BUILD.gn

@@ -115,6 +115,7 @@ source_set("chromeos") {
     "//chromeos/services/multidevice_setup/public/cpp:oobe_completion_tracker",
     "//chromeos/services/multidevice_setup/public/cpp:prefs",
     "//chromeos/services/secure_channel/public/cpp/client",
+    "//chromeos/settings",
     "//chromeos/timezone",
     "//chromeos/tpm",
     "//components/arc",
@@ -2073,6 +2074,7 @@ static_library("test_support") {
     "//chromeos/components/drivefs",
     "//chromeos/components/drivefs:test_support",
     "//chromeos/dbus",
+    "//chromeos/settings",
     "//components/crx_file",
     "//components/drive",
     "//components/policy/proto",

chrome/browser/extensions/BUILD.gn

@@ -966,6 +966,7 @@ jumbo_static_library("extensions") {
       "//chromeos/services/machine_learning/public/cpp",
       "//chromeos/services/machine_learning/public/mojom",
       "//chromeos/services/media_perception/public/mojom",
+      "//chromeos/settings",
       "//chromeos/tpm",
       "//components/arc",
       "//components/constrained_window",

chrome/browser/ui/BUILD.gn

@@ -1762,6 +1762,7 @@ jumbo_split_static_library("ui") {
       "//chromeos/services/multidevice_setup/public/cpp:prefs",
       "//chromeos/services/multidevice_setup/public/cpp:url_provider",
       "//chromeos/services/multidevice_setup/public/mojom",
+      "//chromeos/settings",
       "//chromeos/strings",
       "//components/arc",
       "//components/captive_portal",

chromeos/BUILD.gn

@@ -28,16 +28,12 @@ component("chromeos") {
   public_deps = [
     ":chromeos_constants",
     ":chromeos_export",
-    "//chromeos/settings",
   ]
   deps = [
     ":account_manager_proto",
     "//base",
     "//base:i18n",
-    "//components/device_event_log",
     "//components/policy/proto",
-    "//components/pref_registry",
-    "//components/prefs",
     "//google_apis",
     "//services/network/public/cpp:cpp",
     "//third_party/protobuf:protobuf_lite",
@@ -151,7 +147,6 @@ source_set("test_support_source_set") {
   public_deps = [
     ":chromeos",
     ":test_utils",
-    "//chromeos/network:test_support",
   ]
   deps = [
     "//chromeos/attestation:test_support",
@@ -160,6 +155,7 @@ source_set("test_support_source_set") {
     "//chromeos/disks:test_support",
     "//chromeos/login/auth:test_support",
     "//chromeos/login/login_state:test_support",
+    "//chromeos/network:test_support",
     "//google_apis",
     "//net:test_support",
     "//services/network:test_support",

chromeos/settings/BUILD.gn

@@ -2,25 +2,22 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/chromeos/rules.gni")
 import("//testing/test.gni")
 
 assert(is_chromeos, "Non-Chrome-OS builds must not depend on //chromeos")
 
-source_set("settings") {
-  configs += [ "//chromeos:chromeos_implementation" ]
-  public_deps = [
-    ":cros_settings_names",
-  ]
+component("settings") {
+  defines = [ "IS_CHROMEOS_SETTINGS_IMPL" ]
   deps = [
     "//base",
     "//base:i18n",
     "//chromeos:chromeos_constants",
-    "//chromeos:chromeos_export",
     "//chromeos/login/login_state",
     "//third_party/icu",
   ]
   sources = [
+    "cros_settings_names.cc",
+    "cros_settings_names.h",
     "cros_settings_provider.cc",
     "cros_settings_provider.h",
     "system_settings_provider.cc",
@@ -32,17 +29,6 @@ source_set("settings") {
   ]
 }
 
-source_set("cros_settings_names") {
-  configs += [ "//chromeos:chromeos_implementation" ]
-  deps = [
-    "//chromeos:chromeos_export",
-  ]
-  sources = [
-    "cros_settings_names.cc",
-    "cros_settings_names.h",
-  ]
-}
-
 source_set("unit_tests") {
   testonly = true
   deps = [

chromeos/settings/DEPS

+noparent = True
+
+include_rules = [
+  "+base",
+  "+chromeos/constants",
+  "+chromeos/login/login_state",
+  "+third_party/icu",
+]
+
+specific_include_rules = {
+  ".*test\.cc|mock.*\.*": [
+    "+testing",
+  ],
+}

chromeos/settings/cros_settings_provider.h

@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/callback.h"
-#include "chromeos/chromeos_export.h"
+#include "base/component_export.h"
 
 namespace base {
 class Value;
@@ -16,7 +16,7 @@ class Value;
 
 namespace chromeos {
 
-class CHROMEOS_EXPORT CrosSettingsProvider {
+class COMPONENT_EXPORT(CHROMEOS_SETTINGS) CrosSettingsProvider {
  public:
   // The callback type that is called to notify the CrosSettings observers
   // about a setting change.

chromeos/settings/system_settings_provider.h

@@ -9,8 +9,8 @@
 #include <string>
 
 #include "base/callback.h"
+#include "base/component_export.h"
 #include "base/macros.h"
-#include "chromeos/chromeos_export.h"
 #include "chromeos/settings/cros_settings_provider.h"
 #include "chromeos/settings/timezone_settings.h"
 #include "third_party/icu/source/i18n/unicode/timezone.h"
@@ -21,7 +21,7 @@ class Value;
 
 namespace chromeos {
 
-class CHROMEOS_EXPORT SystemSettingsProvider
+class COMPONENT_EXPORT(CHROMEOS_SETTINGS) SystemSettingsProvider
     : public CrosSettingsProvider,
       public system::TimezoneSettings::Observer {
  public:

chromeos/settings/timezone_settings.h

@@ -7,8 +7,8 @@
 
 #include <vector>
 
+#include "base/component_export.h"
 #include "base/strings/string16.h"
-#include "chromeos/chromeos_export.h"
 #include "chromeos/settings/cros_settings_provider.h"
 #include "third_party/icu/source/i18n/unicode/timezone.h"
 
@@ -16,10 +16,10 @@ namespace chromeos {
 namespace system {
 
 // Canonical name of UTC timezone.
-CHROMEOS_EXPORT extern const char kUTCTimezoneName[];
+COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kUTCTimezoneName[];
 
 // This interface provides access to Chrome OS timezone settings.
-class CHROMEOS_EXPORT TimezoneSettings {
+class COMPONENT_EXPORT(CHROMEOS_SETTINGS) TimezoneSettings {
  public:
   class Observer {
    public:

chromeos/settings/timezone_settings_helper.cc

@@ -4,13 +4,14 @@
 
 #include "chromeos/settings/timezone_settings_helper.h"
 
+#include "base/component_export.h"
 #include "base/logging.h"
-#include "chromeos/chromeos_export.h"
 
 namespace chromeos {
 namespace system {
 
-CHROMEOS_EXPORT const icu::TimeZone* GetKnownTimezoneOrNull(
+COMPONENT_EXPORT(CHROMEOS_SETTINGS)
+const icu::TimeZone* GetKnownTimezoneOrNull(
     const icu::TimeZone& timezone,
     const std::vector<std::unique_ptr<icu::TimeZone>>& timezone_list) {
   const icu::TimeZone* known_timezone = nullptr;

services/device/time_zone_monitor/BUILD.gn

@@ -41,7 +41,7 @@ source_set("time_zone_monitor") {
   }
 
   if (is_chromeos) {
-    deps += [ "//chromeos" ]
+    deps += [ "//chromeos/settings" ]
   }
 
   if (is_mac) {