Switch to direct use of OwnerSettingsServiceChromeOS::Set() in tests.

chrome/browser/chromeos/ownership/fake_owner_settings_service.cc

Index: chrome/browser/chromeos/ownership/fake_owner_settings_service.cc
diff --git a/chrome/browser/chromeos/ownership/fake_owner_settings_service.cc b/chrome/browser/chromeos/ownership/fake_owner_settings_service.cc
index b5154475280f7b0328750b6e66fc64ebe8e09a1b..5c3615feb9b439efd2ad3ae68dfe92d86423f057 100644
--- a/chrome/browser/chromeos/ownership/fake_owner_settings_service.cc
+++ b/chrome/browser/chromeos/ownership/fake_owner_settings_service.cc
@@ -4,13 +4,27 @@
 
 #include "chrome/browser/chromeos/ownership/fake_owner_settings_service.h"
 
+#include "chrome/browser/chromeos/settings/cros_settings.h"
+#include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"
+#include "components/ownership/mock_owner_key_util.h"
+
 namespace chromeos {
 
+FakeOwnerSettingsService::FakeOwnerSettingsService(Profile* profile)
+    : OwnerSettingsServiceChromeOS(nullptr,
+                                   profile,
+                                   new ownership::MockOwnerKeyUtil()),
+      set_management_settings_result_(true),
+      settings_provider_(nullptr) {
+}
+
 FakeOwnerSettingsService::FakeOwnerSettingsService(
     Profile* profile,
-    const scoped_refptr<ownership::OwnerKeyUtil>& owner_key_util)
+    const scoped_refptr<ownership::OwnerKeyUtil>& owner_key_util,
+    StubCrosSettingsProvider* provider)
     : OwnerSettingsServiceChromeOS(nullptr, profile, owner_key_util),
-      set_management_settings_result_(true) {
+      set_management_settings_result_(true),
+      settings_provider_(provider) {
 }
 
 FakeOwnerSettingsService::~FakeOwnerSettingsService() {
@@ -23,4 +37,15 @@ void FakeOwnerSettingsService::SetManagementSettings(
   callback.Run(set_management_settings_result_);
 }
 
+bool FakeOwnerSettingsService::Set(const std::string& setting,
+                                   const base::Value& value) {
+  if (settings_provider_) {
+    settings_provider_->Set(setting, value);
+  } else {
+    CrosSettingsProvider* provider = CrosSettings::Get()->GetProvider(setting);
+    provider->Set(setting, value);
+  }
+  return true;
+}
+
 }  // namespace chromeos