PCM: Remove PrivateClickMeasurement::PcmDataCarried::NonPersonallyIde…

…ntifiable overrides in testing https://bugs.webkit.org/show_bug.cgi?id=224885 <rdar://problem/76973184> Reviewed by Brent Fulgham. We had a temporary override to PrivateClickMeasurement::PcmDataCarried::NonPersonallyIdentifiable in WebKit::PrivateClickMeasurementManager::getTokenPublicKey() and WebKit::PrivateClickMeasurementManager::getSignedUnlinkableToken(). This patch removes those overrides since the network load hang has been resolved. No new tests. Existing tests cover this code. * NetworkProcess/PrivateClickMeasurementManager.cpp: (WebKit::PrivateClickMeasurementManager::getTokenPublicKey): (WebKit::PrivateClickMeasurementManager::getSignedUnlinkableToken): Canonical link: https://commits.webkit.org/236878@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276413 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Apr 22, 2021 · ae7fc7b · ae7fc7b
1 parent 1ded008
commit ae7fc7b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
@@ -1,3 +1,23 @@
+2021-04-21 John Wilander <[email protected]>
+
+ PCM: Remove PrivateClickMeasurement::PcmDataCarried::NonPersonallyIdentifiable overrides in testing
+ https://bugs.webkit.org/show_bug.cgi?id=224885
+ <rdar://problem/76973184>
+
+ Reviewed by Brent Fulgham.
+
+ We had a temporary override to PrivateClickMeasurement::PcmDataCarried::NonPersonallyIdentifiable
+ in WebKit::PrivateClickMeasurementManager::getTokenPublicKey() and
+ WebKit::PrivateClickMeasurementManager::getSignedUnlinkableToken().
+
+ This patch removes those overrides since the network load hang has been resolved.
+
+ No new tests. Existing tests cover this code.
+
+ * NetworkProcess/PrivateClickMeasurementManager.cpp:
+ (WebKit::PrivateClickMeasurementManager::getTokenPublicKey):
+ (WebKit::PrivateClickMeasurementManager::getSignedUnlinkableToken):
+
 2021-04-21 Chris Dumez <[email protected]>
 
  Regression(r275887) open.spotify.com says Safari is not supported

diff --git a/Source/WebKit/NetworkProcess/PrivateClickMeasurementManager.cpp b/Source/WebKit/NetworkProcess/PrivateClickMeasurementManager.cpp
@@ -145,7 +145,6 @@ void PrivateClickMeasurementManager::getTokenPublicKey(PrivateClickMeasurement&&
  if (attributionReportEndpoint == PrivateClickMeasurement::AttributionReportEndpoint::Destination)
  return;
  tokenPublicKeyURL = *m_tokenPublicKeyURLForTesting;
- pcmDataCarried = PrivateClickMeasurement::PcmDataCarried::NonPersonallyIdentifiable;
  }
 
  if (tokenPublicKeyURL.isEmpty() || !tokenPublicKeyURL.isValid())
@@ -183,10 +182,8 @@ void PrivateClickMeasurementManager::getSignedUnlinkableToken(PrivateClickMeasur
  // This is guaranteed to be close in time to the navigational click which makes it likely to be personally identifiable.
  auto pcmDataCarried = PrivateClickMeasurement::PcmDataCarried::PersonallyIdentifiable;
  auto tokenSignatureURL = attribution.tokenSignatureURL();
- if (m_tokenSignatureURLForTesting) {
+ if (m_tokenSignatureURLForTesting)
  tokenSignatureURL = *m_tokenSignatureURLForTesting;
- pcmDataCarried = PrivateClickMeasurement::PcmDataCarried::NonPersonallyIdentifiable;
- }
 
  if (tokenSignatureURL.isEmpty() || !tokenSignatureURL.isValid())
  return;