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

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

Issue 6002015: Policy: generate boilerplate policy type and constant code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge with ToT Created 9 years, 11 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/config_dir_policy_provider_unittest.cc
diff --git a/chrome/browser/policy/config_dir_policy_provider_unittest.cc b/chrome/browser/policy/config_dir_policy_provider_unittest.cc
index 67ac91726e803dc3566245c4cb451eef0dbb7501..4bfd49fe7f318ecaa5b13b2444805739e87296ce 100644
--- a/chrome/browser/policy/config_dir_policy_provider_unittest.cc
+++ b/chrome/browser/policy/config_dir_policy_provider_unittest.cc
@@ -13,7 +13,7 @@
#include "chrome/browser/policy/configuration_policy_pref_store.h"
#include "chrome/browser/policy/mock_configuration_policy_store.h"
#include "chrome/common/json_value_serializer.h"
-#include "chrome/common/policy_constants.h"
+#include "policy/policy_constants.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace policy {
@@ -226,7 +226,7 @@ INSTANTIATE_TEST_CASE_P(
ConfigDirPolicyProviderValueTest,
testing::Values(
ValueTestParams::ForStringPolicy(
- kPolicyHomePage,
+ kPolicyHomepageLocation,
key::kHomepageLocation),
ValueTestParams::ForBooleanPolicy(
kPolicyHomepageIsNewTabPage,
@@ -235,8 +235,8 @@ INSTANTIATE_TEST_CASE_P(
kPolicyRestoreOnStartup,
key::kRestoreOnStartup),
ValueTestParams::ForListPolicy(
- kPolicyURLsToRestoreOnStartup,
- key::kURLsToRestoreOnStartup),
+ kPolicyRestoreOnStartupURLs,
+ key::kRestoreOnStartupURLs),
ValueTestParams::ForBooleanPolicy(
kPolicyDefaultSearchProviderEnabled,
key::kDefaultSearchProviderEnabled),
@@ -304,17 +304,17 @@ INSTANTIATE_TEST_CASE_P(
kPolicyAutoFillEnabled,
key::kAutoFillEnabled),
ValueTestParams::ForStringPolicy(
- kPolicyApplicationLocale,
+ kPolicyApplicationLocaleValue,
key::kApplicationLocaleValue),
ValueTestParams::ForBooleanPolicy(
kPolicySyncDisabled,
key::kSyncDisabled),
ValueTestParams::ForListPolicy(
- kPolicyExtensionInstallAllowList,
- key::kExtensionInstallAllowList),
+ kPolicyExtensionInstallWhitelist,
+ key::kExtensionInstallWhitelist),
ValueTestParams::ForListPolicy(
- kPolicyExtensionInstallDenyList,
- key::kExtensionInstallDenyList),
+ kPolicyExtensionInstallBlacklist,
+ key::kExtensionInstallBlacklist),
ValueTestParams::ForBooleanPolicy(
kPolicyShowHomeButton,
key::kShowHomeButton),

Powered by Google App Engine
This is Rietveld 408576698