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

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

Issue 58313002: Removed the PolicyDefinitionList. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@chrome-policy-schema-10-use-registry
Patch Set: Created 7 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/policy_loader_mac_unittest.cc
diff --git a/chrome/browser/policy/policy_loader_mac_unittest.cc b/chrome/browser/policy/policy_loader_mac_unittest.cc
index 19695d25ff2fd7a6530196a097131e411924a4f8..7503ad635cc1f3eb25bbddcb819c04a6cdc22331 100644
--- a/chrome/browser/policy/policy_loader_mac_unittest.cc
+++ b/chrome/browser/policy/policy_loader_mac_unittest.cc
@@ -128,8 +128,7 @@ class TestHarness : public PolicyProviderTestHarness {
virtual ConfigurationPolicyProvider* CreateProvider(
SchemaRegistry* registry,
- scoped_refptr<base::SequencedTaskRunner> task_runner,
- const PolicyDefinitionList* policy_definition_list) OVERRIDE;
+ scoped_refptr<base::SequencedTaskRunner> task_runner) OVERRIDE;
virtual void InstallEmptyPolicy() OVERRIDE;
virtual void InstallStringPolicy(const std::string& policy_name,
@@ -162,11 +161,10 @@ void TestHarness::SetUp() {}
ConfigurationPolicyProvider* TestHarness::CreateProvider(
SchemaRegistry* registry,
- scoped_refptr<base::SequencedTaskRunner> task_runner,
- const PolicyDefinitionList* policy_definition_list) {
+ scoped_refptr<base::SequencedTaskRunner> task_runner) {
prefs_ = new MockPreferences();
- scoped_ptr<AsyncPolicyLoader> loader(new PolicyLoaderMac(
- task_runner, policy_definition_list, base::FilePath(), prefs_));
+ scoped_ptr<AsyncPolicyLoader> loader(
+ new PolicyLoaderMac(task_runner, base::FilePath(), prefs_));
return new AsyncPolicyProvider(registry, loader.Pass());
}
@@ -239,11 +237,8 @@ class PolicyLoaderMacTest : public PolicyTestBase {
virtual void SetUp() OVERRIDE {
PolicyTestBase::SetUp();
- scoped_ptr<AsyncPolicyLoader> loader(
- new PolicyLoaderMac(loop_.message_loop_proxy(),
- &test_policy_definitions::kList,
- base::FilePath(),
- prefs_));
+ scoped_ptr<AsyncPolicyLoader> loader(new PolicyLoaderMac(
+ loop_.message_loop_proxy(), base::FilePath(), prefs_));
provider_.reset(new AsyncPolicyProvider(&schema_registry_, loader.Pass()));
provider_->Init(&schema_registry_);
}
@@ -259,7 +254,7 @@ class PolicyLoaderMacTest : public PolicyTestBase {
TEST_F(PolicyLoaderMacTest, Invalid) {
ScopedCFTypeRef<CFStringRef> name(
- base::SysUTF8ToCFStringRef(test_policy_definitions::kKeyString));
+ base::SysUTF8ToCFStringRef(test_keys::kKeyString));
const char buffer[] = "binary \xde\xad\xbe\xef data";
ScopedCFTypeRef<CFDataRef> invalid_data(
CFDataCreate(kCFAllocatorDefault,
@@ -278,7 +273,7 @@ TEST_F(PolicyLoaderMacTest, Invalid) {
TEST_F(PolicyLoaderMacTest, TestNonForcedValue) {
ScopedCFTypeRef<CFStringRef> name(
- base::SysUTF8ToCFStringRef(test_policy_definitions::kKeyString));
+ base::SysUTF8ToCFStringRef(test_keys::kKeyString));
ScopedCFTypeRef<CFPropertyListRef> test_value(
base::SysUTF8ToCFStringRef("string value"));
ASSERT_TRUE(test_value.get());
@@ -289,7 +284,7 @@ TEST_F(PolicyLoaderMacTest, TestNonForcedValue) {
loop_.RunUntilIdle();
PolicyBundle expected_bundle;
expected_bundle.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
- .Set(test_policy_definitions::kKeyString,
+ .Set(test_keys::kKeyString,
POLICY_LEVEL_RECOMMENDED,
POLICY_SCOPE_USER,
base::Value::CreateStringValue("string value"),

Powered by Google App Engine
This is Rietveld 408576698