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

Unified Diff: chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc

Issue 762863002: Removed policy::PolicyNamespaceKey. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pass values in ctors Created 6 years, 1 month 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/chromeos/policy/enrollment_handler_chromeos.cc
diff --git a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc
index 7fc8d819fbd6d4440f05663b5681e5816a4fd9a5..aaaa58cb9995c5b7c85db7feccdebe87c803043b 100644
--- a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc
+++ b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc
@@ -76,8 +76,8 @@ EnrollmentHandlerChromeOS::EnrollmentHandlerChromeOS(
management_mode_ == em::PolicyData::CONSUMER_MANAGED);
store_->AddObserver(this);
client_->AddObserver(this);
- client_->AddNamespaceToFetch(PolicyNamespaceKey(
- dm_protocol::kChromeDevicePolicyType, std::string()));
+ client_->AddPolicyTypeToFetch(dm_protocol::kChromeDevicePolicyType,
+ std::string());
}
EnrollmentHandlerChromeOS::~EnrollmentHandlerChromeOS() {
@@ -106,7 +106,7 @@ void EnrollmentHandlerChromeOS::OnPolicyFetched(CloudPolicyClient* client) {
// Validate the policy.
const em::PolicyFetchResponse* policy = client_->GetPolicyFor(
- PolicyNamespaceKey(dm_protocol::kChromeDevicePolicyType, std::string()));
+ dm_protocol::kChromeDevicePolicyType, std::string());
if (!policy) {
ReportResult(EnrollmentStatus::ForFetchError(
DM_STATUS_RESPONSE_DECODING_ERROR));
@@ -141,7 +141,7 @@ void EnrollmentHandlerChromeOS::OnPolicyFetched(CloudPolicyClient* client) {
// ValidateInitialKey(). ValidateInitialKey() still checks that the policy
// data is correctly signed by the new public key when the verification key
// is empty.
- validator->ValidateInitialKey("", "");
+ validator->ValidateInitialKey(std::string(), std::string());
} else {
// If |domain| is empty here, the policy validation code will just use the
// domain from the username field in the policy itself to do key validation.

Powered by Google App Engine
This is Rietveld 408576698