1 files changed, 17 insertions, 24 deletions
diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service.cc
index 7b2bb199cc08..2207540b6ba1 100644
--- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service.cc
+++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service.cc
@@ -1,38 +1,31 @@
---- chrome/browser/enterprise/connectors/device_trust/device_trust_service.cc.orig	2021-06-10 11:07:22 UTC
+--- chrome/browser/enterprise/connectors/device_trust/device_trust_service.cc.orig	2021-07-19 18:45:08 UTC
 +++ chrome/browser/enterprise/connectors/device_trust/device_trust_service.cc
-@@ -21,9 +21,9 @@ DeviceTrustService::DeviceTrustService(Profile* profil
-       signal_report_callback_(
-           base::BindOnce(&DeviceTrustService::OnSignalReported,
-                          base::Unretained(this))) {
--#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC)
-+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD)
-   key_pair_ = std::make_unique<DeviceTrustKeyPair>();
--#endif  // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC)
-+#endif  // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD)
+@@ -82,12 +82,12 @@ void DeviceTrustService::OnReporterInitialized(bool su
  
-   pref_observer_.Init(prefs_);
-   pref_observer_.Add(kContextAwareAccessSignalsAllowlistPref,
-@@ -53,9 +53,9 @@ void DeviceTrustService::OnPolicyUpdated() {
+   DeviceTrustReportEvent report;
  
-   if (!first_report_sent_ &&
-       IsEnabled()) {  // Policy enabled for the first time.
 -#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC)
 +#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD)
-     key_pair_->Init();
+   auto* credential = report.mutable_attestation_credential();
+   credential->set_format(
+       DeviceTrustReportEvent::Credential::EC_NID_X9_62_PRIME256V1_PUBLIC_DER);
+   credential->set_credential(attestation_service_->ExportPEMPublicKey());
 -#endif  // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC)
 +#endif  // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD)
-     reporter_->Init(
-         base::BindRepeating(
-             [](DeviceTrustService* self) { return self->IsEnabled(); },
-@@ -76,9 +76,9 @@ void DeviceTrustService::OnReporterInitialized(bool su
  
-   base::Value val(base::Value::Type::DICTIONARY);
+   reporter_->SendReport(&report, std::move(signal_report_callback_));
+ }
+@@ -117,11 +117,11 @@ void DeviceTrustService::SetSignalReportCallbackForTes
+       base::Unretained(this), std::move(cb));
+ }
  
 -#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC)
 +#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD)
-   val.SetStringKey("machine_attestion_key", key_pair_->ExportPEMPublicKey());
+ std::string DeviceTrustService::GetAttestationCredentialForTesting() const {
+   return attestation_service_->ExportPEMPublicKey();
+ }
 -#endif  // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC)
 +#endif  // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD)
  
-   reporter_->SendReport(std::move(val), std::move(signal_report_callback_));
- }
+ void DeviceTrustService::BuildChallengeResponse(const std::string& challenge,
+                                                 AttestationCallback callback) {