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

Unified Diff: chrome/browser/policy/managed_mode_policy_provider_unittest.cc

Issue 11365112: Change PrefStore::ReadResult to a boolean. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 8 years, 1 month 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/policy/managed_mode_policy_provider_unittest.cc
diff --git a/chrome/browser/policy/managed_mode_policy_provider_unittest.cc b/chrome/browser/policy/managed_mode_policy_provider_unittest.cc
index 7aa89cd82e11ba8276d0a9f6a6a405b835fc0ca1..7e1bd8e54baf09c19753ec8ef3f86c86e7c6de99 100644
--- a/chrome/browser/policy/managed_mode_policy_provider_unittest.cc
+++ b/chrome/browser/policy/managed_mode_policy_provider_unittest.cc
@@ -99,22 +99,15 @@ void TestHarness::InstallPolicy(const std::string& policy_name,
base::Value* policy_value) {
base::DictionaryValue* cached_policy = NULL;
base::Value* value = NULL;
- PrefStore::ReadResult result =
- pref_store_->GetMutableValue(ManagedModePolicyProvider::kPolicies,
- &value);
- switch (result) {
- case PrefStore::READ_NO_VALUE:
- cached_policy = new base::DictionaryValue;
- pref_store_->SetValue(ManagedModePolicyProvider::kPolicies,
- cached_policy);
- break;
- case PrefStore::READ_OK:
- ASSERT_TRUE(value->GetAsDictionary(&cached_policy));
- break;
- default:
- FAIL() << "Invalid result reading policy: " << result;
- return;
+ if (pref_store_->GetMutableValue(ManagedModePolicyProvider::kPolicies,
+ &value)) {
+ ASSERT_TRUE(value->GetAsDictionary(&cached_policy));
+ } else {
+ cached_policy = new base::DictionaryValue;
+ pref_store_->SetValue(ManagedModePolicyProvider::kPolicies,
+ cached_policy);
}
+
cached_policy->SetWithoutPathExpansion(policy_name, policy_value);
}

Powered by Google App Engine
This is Rietveld 408576698