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

chrome/browser/chromeos/attestation/attestation_policy_observer_unittest.cc

Index: chrome/browser/chromeos/attestation/attestation_policy_observer_unittest.cc
diff --git a/chrome/browser/chromeos/attestation/attestation_policy_observer_unittest.cc b/chrome/browser/chromeos/attestation/attestation_policy_observer_unittest.cc
index 61fa81f1a90042783ebcac62ba0e85a90965f9b1..3a1b63034ddf12bf4a6334383326ebc3b1da7891 100644
--- a/chrome/browser/chromeos/attestation/attestation_policy_observer_unittest.cc
+++ b/chrome/browser/chromeos/attestation/attestation_policy_observer_unittest.cc
@@ -5,19 +5,15 @@
 #include <string>
 
 #include "base/bind.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "chrome/browser/chromeos/attestation/attestation_key_payload.pb.h"
 #include "chrome/browser/chromeos/attestation/attestation_policy_observer.h"
 #include "chrome/browser/chromeos/attestation/fake_certificate.h"
-#include "chrome/browser/chromeos/settings/cros_settings.h"
-#include "chrome/browser/chromeos/settings/device_settings_service.h"
-#include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"
+#include "chrome/browser/chromeos/settings/device_settings_test_helper.h"
 #include "chromeos/attestation/mock_attestation_flow.h"
 #include "chromeos/dbus/mock_cryptohome_client.h"
 #include "chromeos/settings/cros_settings_names.h"
 #include "components/policy/core/common/cloud/mock_cloud_policy_client.h"
-#include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
@@ -76,27 +72,12 @@ class FakeDBusData {
 
 }  // namespace
 
-class AttestationPolicyObserverTest : public ::testing::Test {
+class AttestationPolicyObserverTest : public chromeos::OwnerSettingsTestBase {
  public:
-  AttestationPolicyObserverTest()
-      : ui_thread_(content::BrowserThread::UI, &message_loop_) {
-    // Remove the real DeviceSettingsProvider and replace it with a stub.
-    CrosSettings* cros_settings = CrosSettings::Get();
-    device_settings_provider_ =
-        cros_settings->GetProvider(kDeviceAttestationEnabled);
-    cros_settings->RemoveSettingsProvider(device_settings_provider_);
-    cros_settings->AddSettingsProvider(&stub_settings_provider_);
-    cros_settings->SetBoolean(kDeviceAttestationEnabled, true);
+  AttestationPolicyObserverTest() {
     policy_client_.SetDMToken("fake_dm_token");
   }
 
-  virtual ~AttestationPolicyObserverTest() {
-    // Restore the real DeviceSettingsProvider.
-    CrosSettings* cros_settings = CrosSettings::Get();
-    cros_settings->RemoveSettingsProvider(&stub_settings_provider_);
-    cros_settings->AddSettingsProvider(device_settings_provider_);
-  }
-
  protected:
   enum MockOptions {
     MOCK_KEY_EXISTS = 1,          // Configure so a certified key exists.
@@ -104,6 +85,12 @@ class AttestationPolicyObserverTest : public ::testing::Test {
     MOCK_NEW_KEY = (1 << 2)       // Configure expecting new key generation.
   };
 
+  void SetUp() override {
+    chromeos::OwnerSettingsTestBase::SetUp();
+    ReplaceProvider(kDeviceAttestationEnabled);
+    owner_settings_service_->SetBoolean(kDeviceAttestationEnabled, true);
+  }
+
   // Configures mock expectations according to |mock_options|.  If options
   // require that a certificate exists, |certificate| will be used.
   void SetupMocks(int mock_options, const std::string& certificate) {
@@ -166,20 +153,13 @@ class AttestationPolicyObserverTest : public ::testing::Test {
     return serialized;
   }
 
-  base::MessageLoopForUI message_loop_;
-  content::TestBrowserThread ui_thread_;
-  ScopedTestDeviceSettingsService test_device_settings_service_;
-  ScopedTestCrosSettings test_cros_settings_;
-  CrosSettingsProvider* device_settings_provider_;
-  StubCrosSettingsProvider stub_settings_provider_;
   StrictMock<MockCryptohomeClient> cryptohome_client_;
   StrictMock<MockAttestationFlow> attestation_flow_;
   StrictMock<policy::MockCloudPolicyClient> policy_client_;
 };
 
 TEST_F(AttestationPolicyObserverTest, FeatureDisabled) {
-  CrosSettings* cros_settings = CrosSettings::Get();
-  cros_settings->SetBoolean(kDeviceAttestationEnabled, false);
+  owner_settings_service_->SetBoolean(kDeviceAttestationEnabled, false);
   Run();
 }