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

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

Issue 8258018: Generate Chrome policy definition list from policy_templates.json. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix the unittest fix Created 9 years, 2 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/file_based_policy_provider_unittest.cc
diff --git a/chrome/browser/policy/file_based_policy_provider_unittest.cc b/chrome/browser/policy/file_based_policy_provider_unittest.cc
index 45ef9feb8b896852701420bcd95206c7515d2a40..a6537d200c2e33efd6cb463642242db89b1fa002 100644
--- a/chrome/browser/policy/file_based_policy_provider_unittest.cc
+++ b/chrome/browser/policy/file_based_policy_provider_unittest.cc
@@ -41,9 +41,8 @@ TEST_F(AsynchronousPolicyTestBase, ProviderInit) {
// when the file watcher is initialized, since this file may have changed
// between the initial load and creating watcher.
EXPECT_CALL(*provider_delegate, Load()).WillOnce(Return(policies));
- FileBasedPolicyProvider provider(
- ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList(),
- provider_delegate);
+ FileBasedPolicyProvider provider(GetChromePolicyDefinitionList(),
+ provider_delegate);
loop_.RunAllPending();
PolicyMap policy_map;
provider.Provide(&policy_map);
@@ -60,9 +59,8 @@ TEST_F(AsynchronousPolicyTestBase, ProviderRefresh) {
InSequence s;
EXPECT_CALL(*provider_delegate, Load()).WillOnce(Return(
new DictionaryValue));
- FileBasedPolicyProvider file_based_provider(
- ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList(),
- provider_delegate);
+ FileBasedPolicyProvider file_based_provider(GetChromePolicyDefinitionList(),
+ provider_delegate);
// A second call to Load gets triggered during the provider's construction
// when the file watcher is initialized, since this file may have changed
// between the initial load and creating watcher.
« no previous file with comments | « chrome/browser/policy/file_based_policy_provider.cc ('k') | chrome/browser/policy/mock_configuration_policy_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698