diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-13 22:12:39 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-13 22:12:39 +0000 |
| commit | aea9fa18d6b83fa89042d9b16d70a9d1ade82d75 (patch) | |
| tree | 12141767349b89e3f602cd16e87668d2637e3234 /chrome/browser/policy/configuration_policy_reader_unittest.cc | |
| parent | de617a9345708fff10c79c99b9c9279d84013f4e (diff) | |
| download | chromium_src-aea9fa18d6b83fa89042d9b16d70a9d1ade82d75.zip chromium_src-aea9fa18d6b83fa89042d9b16d70a9d1ade82d75.tar.gz chromium_src-aea9fa18d6b83fa89042d9b16d70a9d1ade82d75.tar.bz2 | |
Generate Chrome policy definition list from policy_templates.json.
The struct and static array is now generated into policy_constants.h.
Added policy::GetChromePolicyDefinitionList() and policy::GetPolicyName().
Removed ConfigurationPolicyProvider::PolicyDefinitionList.
Removed PolicyStates::GetPolicyName().
Removed ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList().
BUG=None
TEST=Everything works as before, nothing breaks
Review URL: http://codereview.chromium.org/8258018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105388 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/policy/configuration_policy_reader_unittest.cc')
| -rw-r--r-- | chrome/browser/policy/configuration_policy_reader_unittest.cc | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/chrome/browser/policy/configuration_policy_reader_unittest.cc b/chrome/browser/policy/configuration_policy_reader_unittest.cc index dc76a92..670c0b5 100644 --- a/chrome/browser/policy/configuration_policy_reader_unittest.cc +++ b/chrome/browser/policy/configuration_policy_reader_unittest.cc @@ -148,9 +148,6 @@ TEST_F(ConfigurationPolicyReaderTest, SetIntegerValue) { class PolicyStatusTest : public testing::Test { protected: - typedef ConfigurationPolicyProvider::PolicyDefinitionList - PolicyDefinitionList; - PolicyStatusTest() { managed_platform_ = new MockConfigurationPolicyReader(); managed_cloud_ = new MockConfigurationPolicyReader(); @@ -163,8 +160,7 @@ class PolicyStatusTest : public testing::Test { recommended_cloud_)); status_ok_ = ASCIIToUTF16("ok"); - policy_list_ = - ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList(); + policy_list_ = GetChromePolicyDefinitionList(); policy_list_size_ = static_cast<size_t>(policy_list_->end - policy_list_->begin); } @@ -347,12 +343,4 @@ TEST_F(PolicyStatusTest, GetPolicyStatusListSetPolicies) { } } -TEST_F(PolicyStatusTest, GetPolicyName) { - for (const PolicyDefinitionList::Entry* entry = policy_list_->begin; - entry != policy_list_->end; ++entry) { - EXPECT_EQ(ASCIIToUTF16(entry->name), - PolicyStatus::GetPolicyName(entry->policy_type)); - } -} - } // namespace policy |