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..774e0cf643a675c75b0e97d44a5aa2d48d544378 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,8 +12,9 @@
 #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"

[bartfab (slow), 2015/03/31 14:12:41]

Nit: Still used, e.g. in line 253.

+#include "chrome/browser/chromeos/settings/settings_provider_test_base.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/pref_names.h"
@@ -24,7 +25,6 @@
 #include "chromeos/cryptohome/mock_async_method_caller.h"
 #include "chromeos/dbus/dbus_method_call_status.h"
 #include "chromeos/dbus/mock_cryptohome_client.h"
-#include "chromeos/settings/cros_settings_provider.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "extensions/common/test_util.h"
@@ -139,9 +139,12 @@ void GetCertificateCallbackFalse(
       base::Bind(callback, false, ""));
 }
 
-class EPKPChallengeKeyTestBase : public BrowserWithTestWindowTest {
+class EPKPChallengeKeyTestBase : public BrowserWithTestWindowTest,
+                                 public chromeos::SettingsProviderTestBase {
  protected:
-  EPKPChallengeKeyTestBase() : extension_(test_util::CreateEmptyExtension()) {
+  EPKPChallengeKeyTestBase()
+      : chromeos::SettingsProviderTestBase(false),
+        extension_(test_util::CreateEmptyExtension()) {
     // Set up the default behavior of mocks.
     ON_CALL(mock_cryptohome_client_, TpmAttestationDoesKeyExist(_, _, _, _))
         .WillByDefault(WithArgs<3>(Invoke(FakeBoolDBusMethod(
@@ -163,30 +166,19 @@ class EPKPChallengeKeyTestBase : public BrowserWithTestWindowTest {
     stub_install_attributes_.SetDeviceId("device_id");
     stub_install_attributes_.SetMode(policy::DEVICE_MODE_ENTERPRISE);
 
-    // Replace the default device setting provider with the stub.
-    device_settings_provider_ = chromeos::CrosSettings::Get()->GetProvider(
-        chromeos::kReportDeviceVersionInfo);
-    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));
+    ReplaceProvider(chromeos::kDeviceAttestationEnabled);
   }
 
-  virtual ~EPKPChallengeKeyTestBase() {
-    EXPECT_TRUE(chromeos::CrosSettings::Get()->
-                RemoveSettingsProvider(&stub_settings_provider_));
-    chromeos::CrosSettings::Get()->
-        AddSettingsProvider(device_settings_provider_);
-  }
+  virtual ~EPKPChallengeKeyTestBase() { RestoreProvider(); }

[bartfab (slow), 2015/03/31 14:12:41]

Nit: Per style guide, you must break this into three lines.

 
   virtual void SetUp() override {
     BrowserWithTestWindowTest::SetUp();
 
+    // Set the device settings.
+    InitOwnerSettingsService(browser()->profile());

[bartfab (slow), 2015/03/31 14:12:41]

Nit: #include "chrome/browser/ui/browser.h"

+    owner_settings_service_->SetBoolean(chromeos::kDeviceAttestationEnabled,
+                                        true);
+
     // Set the user preferences.
     prefs_ = browser()->profile()->GetPrefs();
     base::ListValue whitelist;
@@ -208,8 +200,6 @@ class EPKPChallengeKeyTestBase : public BrowserWithTestWindowTest {
   NiceMock<chromeos::attestation::MockAttestationFlow> mock_attestation_flow_;
   scoped_refptr<extensions::Extension> extension_;
   policy::StubEnterpriseInstallAttributes stub_install_attributes_;
-  chromeos::CrosSettingsProvider* device_settings_provider_;
-  chromeos::StubCrosSettingsProvider stub_settings_provider_;
   PrefService* prefs_;
 };
 
@@ -260,8 +250,8 @@ TEST_F(EPKPChallengeMachineKeyTest, ExtensionNotWhitelisted) {
 }
 
 TEST_F(EPKPChallengeMachineKeyTest, DevicePolicyDisabled) {
-  stub_settings_provider_.Set(chromeos::kDeviceAttestationEnabled,
-                              base::FundamentalValue(false));
+  stub_settings_provider_.SetBoolean(chromeos::kDeviceAttestationEnabled,

[bartfab (slow), 2015/03/31 14:12:41]

Why is it that you sometimes use owner_settings_service_->Set*() and other
times, use stub_setting_provider_.Set*()? In some tests you use one, in other
tests the other. And here, you mix both.

+                                     false);
 
   EXPECT_EQ(EPKPChallengeKeyBase::kDevicePolicyDisabledError,
             utils::RunFunctionAndReturnError(func_.get(), kArgs, browser()));
@@ -397,8 +387,8 @@ TEST_F(EPKPChallengeUserKeyTest, ExtensionNotWhitelisted) {
 }
 
 TEST_F(EPKPChallengeUserKeyTest, DevicePolicyDisabled) {
-  stub_settings_provider_.Set(chromeos::kDeviceAttestationEnabled,
-                              base::FundamentalValue(false));
+  stub_settings_provider_.SetBoolean(chromeos::kDeviceAttestationEnabled,
+                                     false);
 
   EXPECT_EQ(EPKPChallengeKeyBase::kDevicePolicyDisabledError,
             utils::RunFunctionAndReturnError(func_.get(), kArgs, browser()));