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

chrome/browser/chromeos/attestation/attestation_policy_observer_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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/scoped_cros_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::_;
 using testing::Invoke;
 using testing::StrictMock;
@@ skipping 47 matching lines @@
  private:
   std::string data_;
 };
 
 }  // namespace
 
 class AttestationPolicyObserverTest : public ::testing::Test {
  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);
+    settings_helper_.ReplaceProvider(kDeviceAttestationEnabled);
+    settings_helper_.SetBoolean(kDeviceAttestationEnabled, true);
     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.
     MOCK_KEY_UPLOADED = (1 << 1), // Configure so an upload has occurred.
     MOCK_NEW_KEY = (1 << 2)       // Configure expecting new key generation.
   };
 
   // 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) {
@@ skipping 51 matching lines @@
   std::string CreatePayload() {
     AttestationKeyPayload proto;
     proto.set_is_certificate_uploaded(true);
     std::string serialized;
     proto.SerializeToString(&serialized);
     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_;
+  ScopedCrosSettingsTestHelper settings_helper_;
   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);
+  settings_helper_.SetBoolean(kDeviceAttestationEnabled, false);
   Run();
 }
 
 TEST_F(AttestationPolicyObserverTest, UnregisteredPolicyClient) {
   policy_client_.SetDMToken("");
   Run();
 }
 
 TEST_F(AttestationPolicyObserverTest, NewCertificate) {
   SetupMocks(MOCK_NEW_KEY, "");
@@ skipping 41 matching lines @@
   SetupMocks(MOCK_NEW_KEY, "");
   // Simulate a DBus failure.
   EXPECT_CALL(cryptohome_client_, TpmAttestationDoesKeyExist(_, _, _, _))
       .WillOnce(WithArgs<3>(Invoke(DBusCallbackError)))
       .WillRepeatedly(WithArgs<3>(Invoke(DBusCallbackFalse)));
   Run();
 }
 
 }  // namespace attestation
 }  // namespace chromeos