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

chrome/browser/chromeos/settings/device_settings_test_helper.h

Index: chrome/browser/chromeos/settings/device_settings_test_helper.h
diff --git a/chrome/browser/chromeos/settings/device_settings_test_helper.h b/chrome/browser/chromeos/settings/device_settings_test_helper.h
index 0e5742e3aabdd187f218634ab98599b2415815de..491255bdbeefca316cacdcdffe14af1d588d0223 100644
--- a/chrome/browser/chromeos/settings/device_settings_test_helper.h
+++ b/chrome/browser/chromeos/settings/device_settings_test_helper.h
@@ -17,10 +17,15 @@
 #include "base/strings/string_util.h"
 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
+#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_policy_builder.h"
+#include "chrome/browser/chromeos/settings/cros_settings.h"
+#include "chrome/browser/chromeos/settings/device_settings_provider.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h"
+#include "chrome/test/base/scoped_testing_local_state.h"
 #include "chromeos/dbus/session_manager_client.h"
+#include "chromeos/settings/cros_settings_provider.h"
 #include "components/ownership/mock_owner_key_util.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -194,6 +199,32 @@ class DeviceSettingsTestBase : public testing::Test {
   DISALLOW_COPY_AND_ASSIGN(DeviceSettingsTestBase);
 };
 
+class OwnerSettingsTestBase : public DeviceSettingsTestBase {
+ protected:
+  OwnerSettingsTestBase();
+  ~OwnerSettingsTestBase() override;
+
+  void SetUp() override;
+  void TearDown() override;
+
+  // Method to replace CrosSettingsProvider for the specified path. It will be
+  // restored in TearDown.
+  void ReplaceProvider(const std::string& path);
+
+  scoped_ptr<DeviceSettingsProvider> settings_provider_;
+  OwnerSettingsServiceChromeOS* owner_settings_service_ = nullptr;
+
+  // Helpers used to mock out cros settings.
+  ScopedTestingLocalState local_state_;
+  ScopedTestDeviceSettingsService test_device_settings_service_;
+  ScopedTestCrosSettings test_cros_settings_;
+  CrosSettingsProvider* device_settings_provider_ = nullptr;
+  ScopedTestOwnerSettings test_owner_settings_;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(OwnerSettingsTestBase);
+};
+
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_