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..a7a09bc8025857d3c67900992af419ce3019630b 100644
--- a/chrome/browser/chromeos/attestation/attestation_policy_observer_unittest.cc
+++ b/chrome/browser/chromeos/attestation/attestation_policy_observer_unittest.cc
@@ -10,9 +10,7 @@
 #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/settings_provider_test_base.h"
 #include "chromeos/attestation/mock_attestation_flow.h"
 #include "chromeos/dbus/mock_cryptohome_client.h"
 #include "chromeos/settings/cros_settings_names.h"
@@ -76,26 +74,18 @@ class FakeDBusData {
 
 }  // namespace
 
-class AttestationPolicyObserverTest : public ::testing::Test {
+class AttestationPolicyObserverTest
+    : public ::testing::Test,
+      public chromeos::SettingsProviderTestBase {

[Mattias Nissler (ping if slow), 2015/03/30 14:45:46]

The coding style generally bans multiple inheritance:

https://google-styleguide.googlecode.com/svn/trunk/cppguide.html#Multiple_Inh...

There's an exception for pure interfaces, but I don't think this applies here.
You might achieve your goal as well by instantiating your helper as a class
member.

[Ivan Podogov, 2015/03/31 08:39:59]

Okay.

  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);
+    ReplaceProvider(kDeviceAttestationEnabled);
+    stub_settings_provider_.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_);
-  }
+  virtual ~AttestationPolicyObserverTest() { RestoreProvider(); }

[Mattias Nissler (ping if slow), 2015/03/30 14:45:45]

Is there a reason RestoreProvider() can't just be called from
~SettingsProviderTestBase()?

[Ivan Podogov, 2015/03/31 08:40:00]

In some cases it cannot: if there is already a ScopedTestCrosSettings in the
test (like in CryptohomeAuthenticatorTest), this leads to a crash... I suppose
this shouldn't be an issue anymore if I change this to a
ScopedCrosSettingsTestHelper.

 
  protected:
   enum MockOptions {
@@ -168,18 +158,13 @@ class AttestationPolicyObserverTest : public ::testing::Test {
 
   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);
+  stub_settings_provider_.SetBoolean(kDeviceAttestationEnabled, false);
   Run();
 }