Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1270)

Unified Diff: chrome/browser/chromeos/settings/device_settings_cache_unittest.cc

Issue 10832035: Switch from SignedSettings to DeviceSettingsService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/settings/device_settings_cache_unittest.cc
diff --git a/chrome/browser/chromeos/settings/signed_settings_cache_unittest.cc b/chrome/browser/chromeos/settings/device_settings_cache_unittest.cc
similarity index 68%
rename from chrome/browser/chromeos/settings/signed_settings_cache_unittest.cc
rename to chrome/browser/chromeos/settings/device_settings_cache_unittest.cc
index de8bbc560674585553c9823e3297b80081d14f6f..d47021b5dcf0bca2a2261b28b1e26c16de487615 100644
--- a/chrome/browser/chromeos/settings/signed_settings_cache_unittest.cc
+++ b/chrome/browser/chromeos/settings/device_settings_cache_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/settings/signed_settings_cache.h"
+#include "chrome/browser/chromeos/settings/device_settings_cache.h"
#include "chrome/browser/policy/proto/chrome_device_policy.pb.h"
#include "chrome/browser/policy/proto/device_management_backend.pb.h"
@@ -14,7 +14,7 @@ namespace em = enterprise_management;
namespace chromeos {
-class SignedSettingsCacheTest : public testing::Test {
+class DeviceSettingsCacheTest : public testing::Test {
protected:
virtual void SetUp() {
// prepare some data.
@@ -23,18 +23,18 @@ class SignedSettingsCacheTest : public testing::Test {
pol.mutable_allow_new_users()->set_allow_new_users(false);
policy_.set_policy_value(pol.SerializeAsString());
- signed_settings_cache::RegisterPrefs(&local_state_);
+ device_settings_cache::RegisterPrefs(&local_state_);
}
TestingPrefService local_state_;
em::PolicyData policy_;
};
-TEST_F(SignedSettingsCacheTest, Basic) {
- EXPECT_TRUE(signed_settings_cache::Store(policy_, &local_state_));
+TEST_F(DeviceSettingsCacheTest, Basic) {
+ EXPECT_TRUE(device_settings_cache::Store(policy_, &local_state_));
em::PolicyData policy_out;
- EXPECT_TRUE(signed_settings_cache::Retrieve(&policy_out, &local_state_));
+ EXPECT_TRUE(device_settings_cache::Retrieve(&policy_out, &local_state_));
EXPECT_TRUE(policy_out.has_policy_type());
EXPECT_TRUE(policy_out.has_policy_value());
@@ -45,13 +45,13 @@ TEST_F(SignedSettingsCacheTest, Basic) {
EXPECT_FALSE(pol.allow_new_users().allow_new_users());
}
-TEST_F(SignedSettingsCacheTest, CorruptData) {
- EXPECT_TRUE(signed_settings_cache::Store(policy_, &local_state_));
+TEST_F(DeviceSettingsCacheTest, CorruptData) {
+ EXPECT_TRUE(device_settings_cache::Store(policy_, &local_state_));
- local_state_.SetString(prefs::kSignedSettingsCache, "blaaa");
+ local_state_.SetString(prefs::kDeviceSettingsCache, "blaaa");
em::PolicyData policy_out;
- EXPECT_FALSE(signed_settings_cache::Retrieve(&policy_out, &local_state_));
+ EXPECT_FALSE(device_settings_cache::Retrieve(&policy_out, &local_state_));
}
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698