summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-27 19:41:28 +0000
committeratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-27 19:41:28 +0000
commit3ad2033c6dabcf75e537d84503af092afd8b537c (patch)
tree61820b6306f46fdd458af96043e03113d490bd40
parent6cea98b7058ed7fc1ffb761a3ceb556aedbb4ad0 (diff)
downloadchromium_src-3ad2033c6dabcf75e537d84503af092afd8b537c.zip
chromium_src-3ad2033c6dabcf75e537d84503af092afd8b537c.tar.gz
chromium_src-3ad2033c6dabcf75e537d84503af092afd8b537c.tar.bz2
Merge 253797 "Changed verification_key_hash to verification_key_..."
> Changed verification_key_hash to verification_key_id in NAC header > > BUG=347070 > > Review URL: https://codereview.chromium.org/181643003 TBR=atwilson@chromium.org Review URL: https://codereview.chromium.org/176953005 git-svn-id: svn://svn.chromium.org/chrome/branches/1847/src@253902 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--components/policy/core/common/cloud/policy_header_service.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/components/policy/core/common/cloud/policy_header_service.cc b/components/policy/core/common/cloud/policy_header_service.cc
index 1f83090..db74cc0 100644
--- a/components/policy/core/common/cloud/policy_header_service.cc
+++ b/components/policy/core/common/cloud/policy_header_service.cc
@@ -13,7 +13,7 @@
namespace {
const char kUserDMTokenKey[] = "user_dmtoken";
const char kUserPolicyTokenKey[] = "user_policy_token";
-const char kVerificationKeyHashKey[] = "verification_key_hash";
+const char kVerificationKeyHashKey[] = "verification_key_id";
}
namespace policy {