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

Unified Diff: chrome/browser/policy/configuration_policy_provider_win_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/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 1d2a9eec7a6a3e5c2d40d665f955f167f5c5d2d6..eed2c064e7541315d84313324bbcc0bad791d2b8 100644
--- a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc
+++ b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc
@@ -17,8 +17,8 @@
#include "chrome/browser/policy/configuration_policy_pref_store.h"
#include "chrome/browser/policy/configuration_policy_provider_win.h"
#include "chrome/browser/policy/mock_configuration_policy_store.h"
-#include "chrome/common/policy_constants.h"
#include "chrome/common/pref_names.h"
+#include "policy/policy_constants.h"
#include "testing/gtest/include/gtest/gtest.h"
using base::win::RegKey;
@@ -358,7 +358,7 @@ INSTANTIATE_TEST_CASE_P(
ConfigurationPolicyProviderWinTest,
testing::Values(
PolicyTestParams::ForStringPolicy(
- kPolicyHomePage,
+ kPolicyHomepageLocation,
key::kHomepageLocation),
PolicyTestParams::ForBooleanPolicy(
kPolicyHomepageIsNewTabPage,
@@ -367,8 +367,8 @@ INSTANTIATE_TEST_CASE_P(
kPolicyRestoreOnStartup,
key::kRestoreOnStartup),
PolicyTestParams::ForListPolicy(
- kPolicyURLsToRestoreOnStartup,
- key::kURLsToRestoreOnStartup),
+ kPolicyRestoreOnStartupURLs,
+ key::kRestoreOnStartupURLs),
PolicyTestParams::ForBooleanPolicy(
kPolicyDefaultSearchProviderEnabled,
key::kDefaultSearchProviderEnabled),
@@ -436,14 +436,14 @@ INSTANTIATE_TEST_CASE_P(
kPolicySyncDisabled,
key::kSyncDisabled),
PolicyTestParams::ForStringPolicy(
- kPolicyApplicationLocale,
+ kPolicyApplicationLocaleValue,
key::kApplicationLocaleValue),
PolicyTestParams::ForListPolicy(
- kPolicyExtensionInstallAllowList,
- key::kExtensionInstallAllowList),
+ kPolicyExtensionInstallWhitelist,
+ key::kExtensionInstallWhitelist),
PolicyTestParams::ForListPolicy(
- kPolicyExtensionInstallDenyList,
- key::kExtensionInstallDenyList),
+ kPolicyExtensionInstallBlacklist,
+ key::kExtensionInstallBlacklist),
PolicyTestParams::ForBooleanPolicy(
kPolicyShowHomeButton,
key::kShowHomeButton),

Powered by Google App Engine
This is Rietveld 408576698