Drop verification_key_hash from CloudPolicyClient constructor

components/policy/core/common/cloud/cloud_policy_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/policy/core/common/cloud/cloud_policy_client.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/guid.h"
 #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"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/url_request/url_request_context_getter.h"
 
 namespace em = enterprise_management;
 
 namespace policy {
 
@@ skipping 23 matching lines @@
 }  // namespace
 
 CloudPolicyClient::Observer::~Observer() {}
 
 void CloudPolicyClient::Observer::OnRobotAuthCodesFetched(
     CloudPolicyClient* client) {}
 
 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),
       weak_ptr_factory_(this) {
 }
 
 CloudPolicyClient::~CloudPolicyClient() {
 }
 
 void CloudPolicyClient::SetupRegistration(const std::string& dm_token,
@@ skipping 151 matching lines @@
     em::PolicyFetchRequest* fetch_request = policy_request->add_request();
     fetch_request->set_policy_type(type_to_fetch.first);
     if (!type_to_fetch.second.empty())
       fetch_request->set_settings_entity_id(type_to_fetch.second);
 
     // Request signed policy blobs to help prevent tampering on the client.
     fetch_request->set_signature_type(em::PolicyFetchRequest::SHA1_RSA);
     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)) {
       if (submit_machine_id_ && !machine_id_.empty())
         fetch_request->set_machine_id(machine_id_);
       if (!last_policy_timestamp_.is_null()) {
         base::TimeDelta timestamp(
             last_policy_timestamp_ - base::Time::UnixEpoch());
         fetch_request->set_timestamp(timestamp.InMilliseconds());
       }
@@ skipping 535 matching lines @@
   for (auto& observer : observers_)
     observer.OnRobotAuthCodesFetched(this);
 }
 
 void CloudPolicyClient::NotifyClientError() {
   for (auto& observer : observers_)
     observer.OnClientError(this);
 }
 
 }  // namespace policy