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

chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.h

Index: chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.h
diff --git a/chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.h b/chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.h
new file mode 100644
index 0000000000000000000000000000000000000000..d133eadce9f134fa3501ffff25b38db019cec5ef
--- /dev/null
+++ b/chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.h
@@ -0,0 +1,83 @@
+// Copyright (c) 2015 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.
+
+#ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_SCOPED_CROS_SETTINGS_TEST_HELPER_H_
+#define CHROME_BROWSER_CHROMEOS_SETTINGS_SCOPED_CROS_SETTINGS_TEST_HELPER_H_
+
+#include <string>
+
+#include "base/macros.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/values.h"
+#include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"
+
+class KeyedService;
+class Profile;
+
+namespace content {
+class BrowserContext;
+}
+
+namespace chromeos {
+
+class CrosSettingsProvider;
+class FakeOwnerSettingsService;
+class ScopedTestCrosSettings;
+class ScopedTestDeviceSettingsService;
+
+class ScopedCrosSettingsTestHelper {
+ public:
+  ScopedCrosSettingsTestHelper();
+
+  // In some cases it is required to pass |create_settings_service| as false:
+  // if the test already has a device settings service and/or CrosSettings set
+  // up by another bundle, creating another one causes crash.
+  explicit ScopedCrosSettingsTestHelper(bool create_settings_service);
+  virtual ~ScopedCrosSettingsTestHelper();
+
+  // Methods to replace and restore CrosSettingsProvider for the specified
+  // |path|.
+  void ReplaceProvider(const std::string& path);
+  void RestoreProvider();
+
+  // Method to create an owner settings service that uses
+  // |stub_settings_provider_| as settings write path.
+  FakeOwnerSettingsService* CreateOwnerSettingsService(Profile* profile);
+
+  // These methods simply call the according |stub_settings_provider_| method.
+  void Set(const std::string& path, const base::Value& in_value);
+  void SetTrustedStatus(CrosSettingsProvider::TrustedStatus status);
+  void SetCurrentUserIsOwner(bool owner);
+
+  // Convenience forms of Set() from CrosSettingsProvider. These methods will
+  // replace any existing value at that |path|, even if it has a different type.
+  void SetBoolean(const std::string& path, bool in_value);
+  void SetInteger(const std::string& path, int in_value);
+  void SetDouble(const std::string& path, double in_value);
+  void SetString(const std::string& path, const std::string& in_value);
+
+  // This may be called before |ReplaceProvider| to copy values currently stored
+  // in the old provider. If the method is called after |ReplaceProvider|, then
+  // the value is retreived from |device_settings_provider_| for any |path|.
+  void CopyStoredValue(const std::string& path);
+
+  // Write the setting from |path| to local state so that it can be retreived
+  // later on browser test startup by the device settings service.
+  void StoreDeviceSetting(const std::string& path);

[Mattias Nissler (ping if slow), 2015/04/07 12:59:18]

Let's rename this to StoreCachedDeviceSetting to make it clear this doesn't
actually touch the underlying device settings.

+
+ private:
+  // Helpers used to mock out cros settings.
+  scoped_ptr<ScopedTestDeviceSettingsService> test_device_settings_service_;
+  scoped_ptr<ScopedTestCrosSettings> test_cros_settings_;
+  CrosSettingsProvider* device_settings_provider_ = nullptr;

[Mattias Nissler (ping if slow), 2015/04/07 12:59:18]

I think you no longer assume anywhere that you're actually swapping out
DeviceSettingsProvider, and in fact ReplaceProvider swaps out whatever provider
is present for the provided |path|. Maybe rename this member to reflect that?

+  StubCrosSettingsProvider stub_settings_provider_;
+
+  void Initialize(bool create_settings_service);
+
+  DISALLOW_COPY_AND_ASSIGN(ScopedCrosSettingsTestHelper);
+};
+
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_SETTINGS_SCOPED_CROS_SETTINGS_TEST_HELPER_H_