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

Unified Diff: components/policy/core/common/cloud/cloud_policy_client.cc

Issue 2537643003: Drop verification_key_hash from CloudPolicyClient constructor (Closed)
Patch Set: Fix CrOS compilation Created 4 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: components/policy/core/common/cloud/cloud_policy_client.cc
diff --git a/components/policy/core/common/cloud/cloud_policy_client.cc b/components/policy/core/common/cloud/cloud_policy_client.cc
index 322ac7916bc8809ee538f625146096e2c5b9a352..00f9409c036326b187ef38e10d75347f1976ac4d 100644
--- a/components/policy/core/common/cloud/cloud_policy_client.cc
+++ b/components/policy/core/common/cloud/cloud_policy_client.cc
@@ -12,6 +12,7 @@
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/stl_util.h"
+#include "components/policy/core/common/cloud/cloud_policy_constants.h"
emaxx 2016/11/29 14:24:58 nit: This is already included in the header file.
Thiemo Nagel 2016/11/29 15:16:38 Done.
#include "components/policy/core/common/cloud/device_management_service.h"
#include "components/policy/core/common/cloud/signing_service.h"
#include "google_apis/gaia/gaia_constants.h"
@@ -55,13 +56,11 @@ void CloudPolicyClient::Observer::OnRobotAuthCodesFetched(
CloudPolicyClient::CloudPolicyClient(
const std::string& machine_id,
const std::string& machine_model,
- const std::string& verification_key_hash,
DeviceManagementService* service,
scoped_refptr<net::URLRequestContextGetter> request_context,
SigningService* signing_service)
: machine_id_(machine_id),
machine_model_(machine_model),
- verification_key_hash_(verification_key_hash),
service_(service), // Can be null for unit tests.
signing_service_(signing_service),
request_context_(request_context),
@@ -233,8 +232,7 @@ void CloudPolicyClient::FetchPolicy() {
if (public_key_version_valid_)
fetch_request->set_public_key_version(public_key_version_);
- if (!verification_key_hash_.empty())
- fetch_request->set_verification_key_hash(verification_key_hash_);
+ fetch_request->set_verification_key_hash(kPolicyVerificationKeyHash);
// These fields are included only in requests for chrome policy.
if (IsChromePolicy(type_to_fetch.first)) {

Powered by Google App Engine
This is Rietveld 408576698