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

chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api_unittest.cc

Index: chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api_unittest.cc
diff --git a/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api_unittest.cc b/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api_unittest.cc
index 7c314887e9890e877e806816fbcc9d4b22c25181..85eef97898a76516788b0128d004d9babc1cb403 100644
--- a/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api_unittest.cc
+++ b/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api_unittest.cc
@@ -12,6 +12,7 @@
 #include "base/prefs/pref_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
+#include "chrome/browser/chromeos/ownership/fake_owner_settings_service.h"
 #include "chrome/browser/chromeos/policy/stub_enterprise_install_attributes.h"
 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
@@ -165,16 +166,12 @@ class EPKPChallengeKeyTestBase : public BrowserWithTestWindowTest {
 
     // Replace the default device setting provider with the stub.
     device_settings_provider_ = chromeos::CrosSettings::Get()->GetProvider(
-        chromeos::kReportDeviceVersionInfo);
+        chromeos::kDeviceAttestationEnabled);
     EXPECT_TRUE(device_settings_provider_ != NULL);
     EXPECT_TRUE(chromeos::CrosSettings::Get()->
                 RemoveSettingsProvider(device_settings_provider_));
     chromeos::CrosSettings::Get()->
         AddSettingsProvider(&stub_settings_provider_);
-
-    // Set the device settings.
-    stub_settings_provider_.Set(chromeos::kDeviceAttestationEnabled,
-                                base::FundamentalValue(true));
   }
 
   virtual ~EPKPChallengeKeyTestBase() {
@@ -187,6 +184,12 @@ class EPKPChallengeKeyTestBase : public BrowserWithTestWindowTest {
   virtual void SetUp() override {
     BrowserWithTestWindowTest::SetUp();
 
+    // Set the device settings.
+    owner_settings_service_.reset(
+        new chromeos::FakeOwnerSettingsService(browser()->profile()));
+    owner_settings_service_->SetBoolean(chromeos::kDeviceAttestationEnabled,
+                                        true);
+
     // Set the user preferences.
     prefs_ = browser()->profile()->GetPrefs();
     base::ListValue whitelist;
@@ -210,6 +213,7 @@ class EPKPChallengeKeyTestBase : public BrowserWithTestWindowTest {
   policy::StubEnterpriseInstallAttributes stub_install_attributes_;
   chromeos::CrosSettingsProvider* device_settings_provider_;
   chromeos::StubCrosSettingsProvider stub_settings_provider_;
+  scoped_ptr<chromeos::FakeOwnerSettingsService> owner_settings_service_;
   PrefService* prefs_;
 };
 
@@ -260,8 +264,8 @@ TEST_F(EPKPChallengeMachineKeyTest, ExtensionNotWhitelisted) {
 }
 
 TEST_F(EPKPChallengeMachineKeyTest, DevicePolicyDisabled) {
-  stub_settings_provider_.Set(chromeos::kDeviceAttestationEnabled,
-                              base::FundamentalValue(false));
+  owner_settings_service_->SetBoolean(chromeos::kDeviceAttestationEnabled,
+                                      false);
 
   EXPECT_EQ(EPKPChallengeKeyBase::kDevicePolicyDisabledError,
             utils::RunFunctionAndReturnError(func_.get(), kArgs, browser()));
@@ -397,8 +401,8 @@ TEST_F(EPKPChallengeUserKeyTest, ExtensionNotWhitelisted) {
 }
 
 TEST_F(EPKPChallengeUserKeyTest, DevicePolicyDisabled) {
-  stub_settings_provider_.Set(chromeos::kDeviceAttestationEnabled,
-                              base::FundamentalValue(false));
+  owner_settings_service_->SetBoolean(chromeos::kDeviceAttestationEnabled,
+                                      false);
 
   EXPECT_EQ(EPKPChallengeKeyBase::kDevicePolicyDisabledError,
             utils::RunFunctionAndReturnError(func_.get(), kArgs, browser()));