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

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

Issue 10384145: Removed ConfigurationPolicyProvider::Provide(). (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebased Created 8 years, 7 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/policy/configuration_policy_provider_win_unittest.cc
diff --git a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc
index 008fdc132c4b1d15e5a5bca3a1f025132e5ec788..80e534e113b5daec46d44919adb9c1a55b77815a 100644
--- a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc
+++ b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc
@@ -13,6 +13,7 @@
#include "chrome/browser/policy/asynchronous_policy_test_base.h"
#include "chrome/browser/policy/configuration_policy_provider_test.h"
#include "chrome/browser/policy/configuration_policy_provider_win.h"
+#include "chrome/browser/policy/policy_bundle.h"
#include "chrome/browser/policy/policy_map.h"
#include "policy/policy_constants.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -58,7 +59,7 @@ class ScopedGroupPolicyRegistrySandbox {
class TestHarness : public PolicyProviderTestHarness {
public:
- explicit TestHarness(HKEY hive);
+ explicit TestHarness(HKEY hive, PolicyScope scope);
virtual ~TestHarness();
virtual void SetUp() OVERRIDE;
@@ -131,8 +132,8 @@ void ScopedGroupPolicyRegistrySandbox::DeleteKeys() {
key.DeleteKey(L"");
}
-TestHarness::TestHarness(HKEY hive)
- : hive_(hive) {}
+TestHarness::TestHarness(HKEY hive, PolicyScope scope)
+ : PolicyProviderTestHarness(POLICY_LEVEL_MANDATORY, scope), hive_(hive) {}
TestHarness::~TestHarness() {}
@@ -199,12 +200,12 @@ void TestHarness::InstallDictionaryPolicy(
// static
PolicyProviderTestHarness* TestHarness::CreateHKCU() {
- return new TestHarness(HKEY_CURRENT_USER);
+ return new TestHarness(HKEY_CURRENT_USER, POLICY_SCOPE_USER);
}
// static
PolicyProviderTestHarness* TestHarness::CreateHKLM() {
- return new TestHarness(HKEY_LOCAL_MACHINE);
+ return new TestHarness(HKEY_LOCAL_MACHINE, POLICY_SCOPE_MACHINE);
}
} // namespace
@@ -243,11 +244,13 @@ TEST_F(ConfigurationPolicyProviderWinTest, HKLMOverHKCU) {
provider_.RefreshPolicies();
loop_.RunAllPending();
- PolicyMap policy_map;
- provider_.Provide(&policy_map);
- const base::Value* value =
- policy_map.GetValue(test_policy_definitions::kKeyString);
- EXPECT_TRUE(base::StringValue("hklm").Equals(value));
+ PolicyBundle expected_bundle;
+ expected_bundle.Get(POLICY_DOMAIN_CHROME, "")
+ .Set(test_policy_definitions::kKeyString,
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE,
+ base::Value::CreateStringValue("hklm"));
+ EXPECT_TRUE(provider_.policies().Equals(expected_bundle));
}
} // namespace policy
« no previous file with comments | « chrome/browser/policy/configuration_policy_provider_test.cc ('k') | chrome/browser/policy/file_based_policy_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698