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

chrome/browser/chromeos/settings/device_settings_provider.cc

Index: chrome/browser/chromeos/settings/device_settings_provider.cc
diff --git a/chrome/browser/chromeos/settings/device_settings_provider.cc b/chrome/browser/chromeos/settings/device_settings_provider.cc
index 02bb836d980022db8a2b9daf7871ef30528fcb7d..ee6739704613499941ac3ea5655e1906e7da9ad6 100644
--- a/chrome/browser/chromeos/settings/device_settings_provider.cc
+++ b/chrome/browser/chromeos/settings/device_settings_provider.cc
@@ -55,10 +55,14 @@ const char* const kKnownSettings[] = {
     kAllowedConnectionTypesForUpdate,
     kAttestationForContentProtectionEnabled,
     kDeviceAttestationEnabled,
+    kDeviceDisabled,
+    kDeviceDisabledMessage,
     kDeviceOwner,
+    kExtensionCacheSize,
     kHeartbeatEnabled,
     kHeartbeatFrequency,
     kPolicyMissingMitigationMode,
+    kRebootOnShutdown,
     kReleaseChannel,
     kReleaseChannelDelegated,
     kReportDeviceActivityTimes,
@@ -78,10 +82,6 @@ const char* const kKnownSettings[] = {
     kSystemUse24HourClock,
     kUpdateDisabled,
     kVariationsRestrictParameter,
-    kDeviceDisabled,
-    kDeviceDisabledMessage,
-    kRebootOnShutdown,
-    kExtensionCacheSize,
 };
 
 bool HasOldMetricsFile() {
@@ -451,6 +451,7 @@ DeviceSettingsProvider::DeviceSettingsProvider(
       device_settings_service_(device_settings_service),
       trusted_status_(TEMPORARILY_UNTRUSTED),
       ownership_status_(device_settings_service_->GetOwnershipStatus()),
+      trusted_for_test_(false),
       store_callback_factory_(this) {
   device_settings_service_->AddObserver(this);
   if (!UpdateFromService()) {
@@ -718,6 +719,8 @@ const base::Value* DeviceSettingsProvider::Get(const std::string& path) const {
 
 DeviceSettingsProvider::TrustedStatus
     DeviceSettingsProvider::PrepareTrustedValues(const base::Closure& cb) {
+  if (trusted_for_test_)

[Mattias Nissler (ping if slow), 2015/03/27 12:42:06]

Uh, why is this needed?

[Ivan Podogov, 2015/03/27 12:51:14]

Because the first time the owner settings observers are called, they get
untrusted values, and those may then go on waiting for the settings to become
trusted some time in the future. And so the tests become broken, as right now
stub settings provider that's used in tests just always returns TRUSTED.

[Mattias Nissler (ping if slow), 2015/03/27 12:58:52]

There are a number of tests that prepare device settings in their Setup() to get
them into trusted state. Can you point me at test tests that are broken?

[Ivan Podogov, 2015/03/27 13:10:50]

Off the top of my head those would be HeartbeatSchedulerTest and
ShutdownPolicyHandlerTest, maybe some others.

[Mattias Nissler (ping if slow), 2015/03/27 13:45:58]

I think it's fine to actually retain StubSettingsProvider, see other comment in
heartbeat_scheduler_unittest.cc

+    return TRUSTED;
   TrustedStatus status = RequestTrustedEntity();
   if (status == TEMPORARILY_UNTRUSTED && !cb.is_null())
     callbacks_.push_back(cb);