<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[281944] trunk/Source/WebKit</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/281944">281944</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-09-02 11:57:34 -0700 (Thu, 02 Sep 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Introduce PCM::Client for PrivateClickMeasurementManager
https://bugs.webkit.org/show_bug.cgi?id=229789

Patch by Alex Christensen <achristensen@webkit.org> on 2021-09-02
Reviewed by Kate Cheney.

This makes it so that PrivateClickMeasurementManager can run in environments other than the NetworkProcess.

* NetworkProcess/NetworkSession.cpp:
(WebKit::NetworkSession::NetworkSession):
* NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementClient.h: Added.
(WebKit::PCM::Client::~Client):
* NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementClientImpl.cpp: Added.
(WebKit::PCM::ClientImpl::ClientImpl):
(WebKit::PCM::ClientImpl::loadFromNetwork):
(WebKit::PCM::ClientImpl::broadcastConsoleMessage):
(WebKit::PCM::ClientImpl::featureEnabled const):
(WebKit::PCM::ClientImpl::debugModeEnabled const):
* NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementClientImpl.h: Added.
* NetworkProcess/PrivateClickMeasurementManager.cpp:
(WebKit::PrivateClickMeasurementManager::PrivateClickMeasurementManager):
(WebKit::PrivateClickMeasurementManager::storeUnattributed):
(WebKit::PrivateClickMeasurementManager::getTokenPublicKey):
(WebKit::PrivateClickMeasurementManager::getSignedUnlinkableToken):
(WebKit::PrivateClickMeasurementManager::handleAttribution):
(WebKit::PrivateClickMeasurementManager::attribute):
(WebKit::PrivateClickMeasurementManager::fireConversionRequestImpl):
(WebKit::PrivateClickMeasurementManager::featureEnabled const):
(WebKit::PrivateClickMeasurementManager::debugModeEnabled const):
* NetworkProcess/PrivateClickMeasurementManager.h:
* Sources.txt:
* WebKit.xcodeproj/project.pbxproj:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitNetworkProcessNetworkSessioncpp">trunk/Source/WebKit/NetworkProcess/NetworkSession.cpp</a></li>
<li><a href="#trunkSourceWebKitNetworkProcessPrivateClickMeasurementManagercpp">trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurementManager.cpp</a></li>
<li><a href="#trunkSourceWebKitNetworkProcessPrivateClickMeasurementManagerh">trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurementManager.h</a></li>
<li><a href="#trunkSourceWebKitSourcestxt">trunk/Source/WebKit/Sources.txt</a></li>
<li><a href="#trunkSourceWebKitWebKitxcodeprojprojectpbxproj">trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitNetworkProcessPrivateClickMeasurementPrivateClickMeasurementClienth">trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementClient.h</a></li>
<li><a href="#trunkSourceWebKitNetworkProcessPrivateClickMeasurementPrivateClickMeasurementClientImplcpp">trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementClientImpl.cpp</a></li>
<li><a href="#trunkSourceWebKitNetworkProcessPrivateClickMeasurementPrivateClickMeasurementClientImplh">trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementClientImpl.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (281943 => 281944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-09-02 18:53:37 UTC (rev 281943)
+++ trunk/Source/WebKit/ChangeLog       2021-09-02 18:57:34 UTC (rev 281944)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2021-09-02  Alex Christensen  <achristensen@webkit.org>
+
+        Introduce PCM::Client for PrivateClickMeasurementManager
+        https://bugs.webkit.org/show_bug.cgi?id=229789
+
+        Reviewed by Kate Cheney.
+
+        This makes it so that PrivateClickMeasurementManager can run in environments other than the NetworkProcess.
+
+        * NetworkProcess/NetworkSession.cpp:
+        (WebKit::NetworkSession::NetworkSession):
+        * NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementClient.h: Added.
+        (WebKit::PCM::Client::~Client):
+        * NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementClientImpl.cpp: Added.
+        (WebKit::PCM::ClientImpl::ClientImpl):
+        (WebKit::PCM::ClientImpl::loadFromNetwork):
+        (WebKit::PCM::ClientImpl::broadcastConsoleMessage):
+        (WebKit::PCM::ClientImpl::featureEnabled const):
+        (WebKit::PCM::ClientImpl::debugModeEnabled const):
+        * NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementClientImpl.h: Added.
+        * NetworkProcess/PrivateClickMeasurementManager.cpp:
+        (WebKit::PrivateClickMeasurementManager::PrivateClickMeasurementManager):
+        (WebKit::PrivateClickMeasurementManager::storeUnattributed):
+        (WebKit::PrivateClickMeasurementManager::getTokenPublicKey):
+        (WebKit::PrivateClickMeasurementManager::getSignedUnlinkableToken):
+        (WebKit::PrivateClickMeasurementManager::handleAttribution):
+        (WebKit::PrivateClickMeasurementManager::attribute):
+        (WebKit::PrivateClickMeasurementManager::fireConversionRequestImpl):
+        (WebKit::PrivateClickMeasurementManager::featureEnabled const):
+        (WebKit::PrivateClickMeasurementManager::debugModeEnabled const):
+        * NetworkProcess/PrivateClickMeasurementManager.h:
+        * Sources.txt:
+        * WebKit.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2021-09-02  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [COOP] Cross origin isolation doesn't happen when going from an HTTP URL to a HTTPS one with COOP+COEP
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessNetworkSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/NetworkSession.cpp (281943 => 281944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/NetworkSession.cpp    2021-09-02 18:53:37 UTC (rev 281943)
+++ trunk/Source/WebKit/NetworkProcess/NetworkSession.cpp       2021-09-02 18:57:34 UTC (rev 281944)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "NetworkResourceLoader.h"
</span><span class="cx"> #include "NetworkSessionCreationParameters.h"
</span><span class="cx"> #include "PingLoad.h"
</span><ins>+#include "PrivateClickMeasurementClientImpl.h"
</ins><span class="cx"> #include "PrivateClickMeasurementManager.h"
</span><span class="cx"> #include "WebPageProxy.h"
</span><span class="cx"> #include "WebPageProxyMessages.h"
</span><span class="lines">@@ -139,13 +140,8 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(RESOURCE_LOAD_STATISTICS)
</span><span class="cx">     setResourceLoadStatisticsEnabled(parameters.resourceLoadStatisticsParameters.enabled);
</span><del>-    m_privateClickMeasurement = makeUnique<PrivateClickMeasurementManager>(*this, networkProcess, parameters.sessionID, pcmStoreDirectory(*this, parameters.resourceLoadStatisticsParameters.directory, parameters.resourceLoadStatisticsParameters.privateClickMeasurementStorageDirectory), [weakThis = makeWeakPtr(this)] (auto&& loadParameters, auto&& completionHandler) {
-        if (!weakThis)
-            return completionHandler(ResourceError(ResourceError::Type::Cancellation), { }, { });
-
-        PrivateClickMeasurementNetworkLoader::start(*weakThis, WTFMove(loadParameters), WTFMove(completionHandler));
-    });
</del><span class="cx"> #endif
</span><ins>+    m_privateClickMeasurement = makeUnique<PrivateClickMeasurementManager>(makeUniqueRef<PCM::ClientImpl>(*this, networkProcess), pcmStoreDirectory(*this, parameters.resourceLoadStatisticsParameters.directory, parameters.resourceLoadStatisticsParameters.privateClickMeasurementStorageDirectory));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> NetworkSession::~NetworkSession()
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessPrivateClickMeasurementPrivateClickMeasurementClienth"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementClient.h (0 => 281944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementClient.h                               (rev 0)
+++ trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementClient.h  2021-09-02 18:57:34 UTC (rev 281944)
</span><span class="lines">@@ -0,0 +1,57 @@
</span><ins>+/*
+ * Copyright (C) 2021 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <wtf/JSONValues.h>
+
+namespace JSC {
+enum class MessageLevel : uint8_t;
+}
+
+namespace WebCore {
+class ResourceError;
+class ResourceResponse;
+}
+
+namespace WebKit {
+
+class NetworkLoadParameters;
+
+namespace PCM {
+
+class Client {
+public:
+    virtual ~Client() { }
+    using NetworkLoadCallback = CompletionHandler<void(const WebCore::ResourceError&, const WebCore::ResourceResponse&, const RefPtr<JSON::Object>&)>;
+    virtual void loadFromNetwork(NetworkLoadParameters&&, NetworkLoadCallback&&) = 0;
+    virtual void broadcastConsoleMessage(JSC::MessageLevel, const String&) = 0;
+    virtual bool featureEnabled() const = 0;
+    virtual bool debugModeEnabled() const = 0;
+};
+
+} // namespace PCM
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessPrivateClickMeasurementPrivateClickMeasurementClientImplcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementClientImpl.cpp (0 => 281944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementClientImpl.cpp                         (rev 0)
+++ trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementClientImpl.cpp    2021-09-02 18:57:34 UTC (rev 281944)
</span><span class="lines">@@ -0,0 +1,72 @@
</span><ins>+/*
+ * Copyright (C) 2021 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "PrivateClickMeasurementClientImpl.h"
+
+#include "NetworkProcess.h"
+#include "NetworkSession.h"
+
+namespace WebKit {
+
+namespace PCM {
+
+ClientImpl::ClientImpl(NetworkSession& session, NetworkProcess& networkProcess)
+    : m_networkSession(makeWeakPtr(session))
+    , m_networkProcess(networkProcess) { }
+
+void ClientImpl::loadFromNetwork(NetworkLoadParameters&& loadParameters, NetworkLoadCallback&& completionHandler)
+{
+    if (!featureEnabled())
+        return completionHandler(ResourceError(ResourceError::Type::Cancellation), { }, { });
+
+    PrivateClickMeasurementNetworkLoader::start(*m_networkSession, WTFMove(loadParameters), WTFMove(completionHandler));
+}
+
+void ClientImpl::broadcastConsoleMessage(JSC::MessageLevel messageLevel, const String& message)
+{
+    if (!featureEnabled())
+        return;
+
+    m_networkProcess->broadcastConsoleMessage(m_networkSession->sessionID(), MessageSource::PrivateClickMeasurement, messageLevel, message);
+}
+
+bool ClientImpl::featureEnabled() const
+{
+    return m_networkSession
+        && m_networkProcess->privateClickMeasurementEnabled()
+        && !m_networkSession->sessionID().isEphemeral();
+}
+
+bool ClientImpl::debugModeEnabled() const
+{
+    return m_networkSession
+        && m_networkProcess->privateClickMeasurementDebugModeEnabled()
+        && !m_networkSession->sessionID().isEphemeral();
+}
+
+} // namespace PCM
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessPrivateClickMeasurementPrivateClickMeasurementClientImplh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementClientImpl.h (0 => 281944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementClientImpl.h                           (rev 0)
+++ trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementClientImpl.h      2021-09-02 18:57:34 UTC (rev 281944)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+/*
+ * Copyright (C) 2021 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include "PrivateClickMeasurementClient.h"
+#include <pal/SessionID.h>
+#include <wtf/FastMalloc.h>
+
+namespace WebKit {
+
+class NetworkSession;
+class NetworkProcess;
+
+namespace PCM {
+
+class ClientImpl : public Client {
+    WTF_MAKE_FAST_ALLOCATED;
+public:
+    ClientImpl(NetworkSession&, NetworkProcess&);
+
+private:
+    void loadFromNetwork(NetworkLoadParameters&&, NetworkLoadCallback&&) final;
+    void broadcastConsoleMessage(JSC::MessageLevel, const String&) final;
+    bool featureEnabled() const final;
+    bool debugModeEnabled() const final;
+
+    WeakPtr<NetworkSession> m_networkSession;
+    Ref<NetworkProcess> m_networkProcess;
+};
+
+} // namespace PCM
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessPrivateClickMeasurementManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurementManager.cpp (281943 => 281944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurementManager.cpp    2021-09-02 18:53:37 UTC (rev 281943)
+++ trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurementManager.cpp       2021-09-02 18:57:34 UTC (rev 281944)
</span><span class="lines">@@ -53,16 +53,11 @@
</span><span class="cx"> 
</span><span class="cx"> constexpr Seconds debugModeSecondsUntilSend { 10_s };
</span><span class="cx"> 
</span><del>-PrivateClickMeasurementManager::PrivateClickMeasurementManager(NetworkSession& networkSession, NetworkProcess& networkProcess, PAL::SessionID sessionID, const String& storageDirectory, Function<void(NetworkLoadParameters&&, NetworkLoadCallback&&)>&& networkLoadFunction)
</del><ins>+PrivateClickMeasurementManager::PrivateClickMeasurementManager(UniqueRef<PCM::Client>&& client, const String& storageDirectory)
</ins><span class="cx">     : m_firePendingAttributionRequestsTimer(*this, &PrivateClickMeasurementManager::firePendingAttributionRequests)
</span><del>-    , m_networkSession(makeWeakPtr(networkSession))
-    , m_networkProcess(networkProcess)
-    , m_sessionID(sessionID)
</del><span class="cx">     , m_storageDirectory(storageDirectory)
</span><del>-    , m_networkLoadFunction(WTFMove(networkLoadFunction))
</del><ins>+    , m_client(WTFMove(client))
</ins><span class="cx"> {
</span><del>-    ASSERT(m_networkLoadFunction);
-
</del><span class="cx">     // We should send any pending attributions on session-start in case their
</span><span class="cx">     // send delay has expired while the session was closed. Waiting 5 seconds accounts for the
</span><span class="cx">     // delay in database startup.
</span><span class="lines">@@ -92,7 +87,7 @@
</span><span class="cx">             else {
</span><span class="cx">                 if (auto errorMessage = measurement.calculateAndUpdateSourceUnlinkableToken(publicKeyBase64URL)) {
</span><span class="cx">                     RELEASE_LOG_INFO(PrivateClickMeasurement, "Got the following error in calculateAndUpdateSourceUnlinkableToken(): '%{public}s", errorMessage->utf8().data());
</span><del>-                    m_networkProcess->broadcastConsoleMessage(m_sessionID, MessageSource::PrivateClickMeasurement, MessageLevel::Error, makeString("[Private Click Measurement] "_s, *errorMessage));
</del><ins>+                    m_client->broadcastConsoleMessage(MessageLevel::Error, makeString("[Private Click Measurement] "_s, *errorMessage));
</ins><span class="cx">                     return;
</span><span class="cx">                 }
</span><span class="cx">             }
</span><span class="lines">@@ -103,7 +98,7 @@
</span><span class="cx">         });
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    m_networkProcess->broadcastConsoleMessage(m_sessionID, MessageSource::PrivateClickMeasurement, MessageLevel::Log, "[Private Click Measurement] Storing a click."_s);
</del><ins>+    m_client->broadcastConsoleMessage(MessageLevel::Log, "[Private Click Measurement] Storing a click."_s);
</ins><span class="cx"> 
</span><span class="cx">     insertPrivateClickMeasurement(WTFMove(measurement), PrivateClickMeasurementAttributionType::Unattributed);
</span><span class="cx"> }
</span><span class="lines">@@ -158,23 +153,23 @@
</span><span class="cx">     auto loadParameters = generateNetworkLoadParametersForHttpGet(WTFMove(tokenPublicKeyURL), pcmDataCarried, debugModeEnabled());
</span><span class="cx"> 
</span><span class="cx">     RELEASE_LOG_INFO(PrivateClickMeasurement, "About to fire a token public key request.");
</span><del>-    m_networkProcess->broadcastConsoleMessage(m_sessionID, MessageSource::PrivateClickMeasurement, MessageLevel::Log, "[Private Click Measurement] About to fire a token public key request."_s);
</del><ins>+    m_client->broadcastConsoleMessage(MessageLevel::Log, "[Private Click Measurement] About to fire a token public key request."_s);
</ins><span class="cx"> 
</span><del>-    m_networkLoadFunction(WTFMove(loadParameters), [weakThis = makeWeakPtr(*this), this, attribution = WTFMove(attribution), callback = WTFMove(callback)] (auto& error, auto& response, auto& jsonObject) mutable {
</del><ins>+    m_client->loadFromNetwork(WTFMove(loadParameters), [weakThis = makeWeakPtr(*this), this, attribution = WTFMove(attribution), callback = WTFMove(callback)] (auto& error, auto& response, auto& jsonObject) mutable {
</ins><span class="cx">         if (!weakThis)
</span><span class="cx">             return;
</span><span class="cx"> 
</span><span class="cx">         if (!error.isNull()) {
</span><del>-            m_networkProcess->broadcastConsoleMessage(m_sessionID, MessageSource::PrivateClickMeasurement, MessageLevel::Error, makeString("[Private Click Measurement] Received error: '"_s, error.localizedDescription(), "' for token public key request."_s));
</del><ins>+            m_client->broadcastConsoleMessage(MessageLevel::Error, makeString("[Private Click Measurement] Received error: '"_s, error.localizedDescription(), "' for token public key request."_s));
</ins><span class="cx">             return;
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         if (!jsonObject) {
</span><del>-            m_networkProcess->broadcastConsoleMessage(m_sessionID, MessageSource::PrivateClickMeasurement, MessageLevel::Error, makeString("[Private Click Measurement] JSON response is empty for token public key request."_s));
</del><ins>+            m_client->broadcastConsoleMessage(MessageLevel::Error, makeString("[Private Click Measurement] JSON response is empty for token public key request."_s));
</ins><span class="cx">             return;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        m_networkProcess->broadcastConsoleMessage(m_sessionID, MessageSource::PrivateClickMeasurement, MessageLevel::Log, makeString("[Private Click Measurement] Got JSON response for token public key request."_s));
</del><ins>+        m_client->broadcastConsoleMessage(MessageLevel::Log, makeString("[Private Click Measurement] Got JSON response for token public key request."_s));
</ins><span class="cx"> 
</span><span class="cx">         callback(WTFMove(attribution), jsonObject->getString("token_public_key"_s));
</span><span class="cx">     });
</span><span class="lines">@@ -201,25 +196,25 @@
</span><span class="cx">     auto loadParameters = generateNetworkLoadParametersForHttpPost(WTFMove(tokenSignatureURL), measurement.tokenSignatureJSON(), pcmDataCarried, debugModeEnabled());
</span><span class="cx"> 
</span><span class="cx">     RELEASE_LOG_INFO(PrivateClickMeasurement, "About to fire a unlinkable token signing request.");
</span><del>-    m_networkProcess->broadcastConsoleMessage(m_sessionID, MessageSource::PrivateClickMeasurement, MessageLevel::Log, "[Private Click Measurement] About to fire a unlinkable token signing request."_s);
</del><ins>+    m_client->broadcastConsoleMessage(MessageLevel::Log, "[Private Click Measurement] About to fire a unlinkable token signing request."_s);
</ins><span class="cx"> 
</span><del>-    m_networkLoadFunction(WTFMove(loadParameters), [weakThis = makeWeakPtr(*this), this, measurement = WTFMove(measurement)] (auto& error, auto& response, auto& jsonObject) mutable {
</del><ins>+    m_client->loadFromNetwork(WTFMove(loadParameters), [weakThis = makeWeakPtr(*this), this, measurement = WTFMove(measurement)] (auto& error, auto& response, auto& jsonObject) mutable {
</ins><span class="cx">         if (!weakThis)
</span><span class="cx">             return;
</span><span class="cx"> 
</span><span class="cx">         if (!error.isNull()) {
</span><del>-            m_networkProcess->broadcastConsoleMessage(m_sessionID, MessageSource::PrivateClickMeasurement, MessageLevel::Error, makeString("[Private Click Measurement] Received error: '"_s, error.localizedDescription(), "' for secret token signing request."_s));
</del><ins>+            m_client->broadcastConsoleMessage(MessageLevel::Error, makeString("[Private Click Measurement] Received error: '"_s, error.localizedDescription(), "' for secret token signing request."_s));
</ins><span class="cx">             return;
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         if (!jsonObject) {
</span><del>-            m_networkProcess->broadcastConsoleMessage(m_sessionID, MessageSource::PrivateClickMeasurement, MessageLevel::Error, makeString("[Private Click Measurement] JSON response is empty for token signing request."_s));
</del><ins>+            m_client->broadcastConsoleMessage(MessageLevel::Error, makeString("[Private Click Measurement] JSON response is empty for token signing request."_s));
</ins><span class="cx">             return;
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         auto signatureBase64URL = jsonObject->getString("unlinkable_token"_s);
</span><span class="cx">         if (signatureBase64URL.isEmpty()) {
</span><del>-            m_networkProcess->broadcastConsoleMessage(m_sessionID, MessageSource::PrivateClickMeasurement, MessageLevel::Error, makeString("[Private Click Measurement] JSON response doesn't have the key 'unlinkable_token' for token signing request."_s));
</del><ins>+            m_client->broadcastConsoleMessage(MessageLevel::Error, makeString("[Private Click Measurement] JSON response doesn't have the key 'unlinkable_token' for token signing request."_s));
</ins><span class="cx">             return;
</span><span class="cx">         }
</span><span class="cx">         // FIX NOW!
</span><span class="lines">@@ -229,13 +224,13 @@
</span><span class="cx">         else {
</span><span class="cx">             if (auto errorMessage = measurement.calculateAndUpdateSourceSecretToken(signatureBase64URL)) {
</span><span class="cx">                 RELEASE_LOG_INFO(PrivateClickMeasurement, "Got the following error in calculateAndUpdateSourceSecretToken(): '%{public}s", errorMessage->utf8().data());
</span><del>-                m_networkProcess->broadcastConsoleMessage(m_sessionID, MessageSource::PrivateClickMeasurement, MessageLevel::Error, makeString("[Private Click Measurement] "_s, *errorMessage));
</del><ins>+                m_client->broadcastConsoleMessage(MessageLevel::Error, makeString("[Private Click Measurement] "_s, *errorMessage));
</ins><span class="cx">                 return;
</span><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-        m_networkProcess->broadcastConsoleMessage(m_sessionID, MessageSource::PrivateClickMeasurement, MessageLevel::Log, "[Private Click Measurement] Storing a secret token."_s);
</del><ins>+        m_client->broadcastConsoleMessage(MessageLevel::Log, "[Private Click Measurement] Storing a secret token."_s);
</ins><span class="cx"> 
</span><span class="cx">         insertPrivateClickMeasurement(WTFMove(measurement), PrivateClickMeasurementAttributionType::Unattributed);
</span><span class="cx">     });
</span><span class="lines">@@ -262,16 +257,16 @@
</span><span class="cx">     auto& firstPartyURL = redirectRequest.firstPartyForCookies();
</span><span class="cx"> 
</span><span class="cx">     if (!redirectDomain.matches(requestURL)) {
</span><del>-        m_networkProcess->broadcastConsoleMessage(m_sessionID, MessageSource::PrivateClickMeasurement, MessageLevel::Warning, "[Private Click Measurement] Triggering event was not accepted because the HTTP redirect was not same-site."_s);
</del><ins>+        m_client->broadcastConsoleMessage(MessageLevel::Warning, "[Private Click Measurement] Triggering event was not accepted because the HTTP redirect was not same-site."_s);
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (redirectDomain.matches(firstPartyURL)) {
</span><del>-        m_networkProcess->broadcastConsoleMessage(m_sessionID, MessageSource::PrivateClickMeasurement, MessageLevel::Warning, "[Private Click Measurement] Triggering event was not accepted because it was requested in an HTTP redirect that is same-site as the first-party."_s);
</del><ins>+        m_client->broadcastConsoleMessage(MessageLevel::Warning, "[Private Click Measurement] Triggering event was not accepted because it was requested in an HTTP redirect that is same-site as the first-party."_s);
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    m_networkProcess->broadcastConsoleMessage(m_sessionID, MessageSource::PrivateClickMeasurement, MessageLevel::Log, "[Private Click Measurement] Triggering event accepted."_s);
</del><ins>+    m_client->broadcastConsoleMessage(MessageLevel::Log, "[Private Click Measurement] Triggering event accepted."_s);
</ins><span class="cx"> 
</span><span class="cx">     attribute(SourceSite { WTFMove(redirectDomain) }, AttributionDestinationSite { firstPartyURL }, WTFMove(attributionTriggerData));
</span><span class="cx"> }
</span><span class="lines">@@ -303,7 +298,7 @@
</span><span class="cx"> 
</span><span class="cx">         if (UNLIKELY(debugModeEnabled())) {
</span><span class="cx">             for (auto& message : debugInfo.messages)
</span><del>-                m_networkProcess->broadcastConsoleMessage(m_sessionID, MessageSource::PrivateClickMeasurement, message.messageLevel, message.message);
</del><ins>+                m_client->broadcastConsoleMessage(message.messageLevel, message.message);
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         if (attributionSecondsUntilSendData.value().hasValidSecondsUntilSendValues()) {
</span><span class="lines">@@ -317,10 +312,10 @@
</span><span class="cx">                 return;
</span><span class="cx"> 
</span><span class="cx">             if (UNLIKELY(debugModeEnabled())) {
</span><del>-                m_networkProcess->broadcastConsoleMessage(m_sessionID, MessageSource::PrivateClickMeasurement, MessageLevel::Log, makeString("[Private Click Measurement] Setting timer for firing attribution request to the debug mode timeout of "_s, debugModeSecondsUntilSend.seconds(), " seconds where the regular timeout would have been "_s, minSecondsUntilSend.value().seconds(), " seconds."_s));
</del><ins>+                m_client->broadcastConsoleMessage(MessageLevel::Log, makeString("[Private Click Measurement] Setting timer for firing attribution request to the debug mode timeout of "_s, debugModeSecondsUntilSend.seconds(), " seconds where the regular timeout would have been "_s, minSecondsUntilSend.value().seconds(), " seconds."_s));
</ins><span class="cx">                 minSecondsUntilSend = debugModeSecondsUntilSend;
</span><span class="cx">             } else
</span><del>-                m_networkProcess->broadcastConsoleMessage(m_sessionID, MessageSource::PrivateClickMeasurement, MessageLevel::Log, makeString("[Private Click Measurement] Setting timer for firing attribution request to the timeout of "_s, minSecondsUntilSend.value().seconds(), " seconds."_s));
</del><ins>+                m_client->broadcastConsoleMessage(MessageLevel::Log, makeString("[Private Click Measurement] Setting timer for firing attribution request to the timeout of "_s, minSecondsUntilSend.value().seconds(), " seconds."_s));
</ins><span class="cx"> 
</span><span class="cx">             startTimer(*minSecondsUntilSend);
</span><span class="cx">         }
</span><span class="lines">@@ -376,14 +371,14 @@
</span><span class="cx">     auto loadParameters = generateNetworkLoadParametersForHttpPost(WTFMove(attributionURL), attribution.attributionReportJSON(), PrivateClickMeasurement::PcmDataCarried::NonPersonallyIdentifiable, debugModeEnabled());
</span><span class="cx"> 
</span><span class="cx">     RELEASE_LOG_INFO(PrivateClickMeasurement, "About to fire an attribution request.");
</span><del>-    m_networkProcess->broadcastConsoleMessage(m_sessionID, MessageSource::PrivateClickMeasurement, MessageLevel::Log, "[Private Click Measurement] About to fire an attribution request."_s);
</del><ins>+    m_client->broadcastConsoleMessage(MessageLevel::Log, "[Private Click Measurement] About to fire an attribution request."_s);
</ins><span class="cx"> 
</span><del>-    m_networkLoadFunction(WTFMove(loadParameters), [weakThis = makeWeakPtr(*this), this](auto& error, auto& response, auto&) {
</del><ins>+    m_client->loadFromNetwork(WTFMove(loadParameters), [weakThis = makeWeakPtr(*this), this](auto& error, auto& response, auto&) {
</ins><span class="cx">         if (!weakThis)
</span><span class="cx">             return;
</span><span class="cx"> 
</span><span class="cx">         if (!error.isNull()) {
</span><del>-            m_networkProcess->broadcastConsoleMessage(m_sessionID, MessageSource::PrivateClickMeasurement, MessageLevel::Error, makeString("[Private Click Measurement] Received error: '"_s, error.localizedDescription(), "' for ad click attribution request."_s));
</del><ins>+            m_client->broadcastConsoleMessage(MessageLevel::Error, makeString("[Private Click Measurement] Received error: '"_s, error.localizedDescription(), "' for ad click attribution request."_s));
</ins><span class="cx">         }
</span><span class="cx">     });
</span><span class="cx"> }
</span><span class="lines">@@ -529,12 +524,12 @@
</span><span class="cx"> 
</span><span class="cx"> bool PrivateClickMeasurementManager::featureEnabled() const
</span><span class="cx"> {
</span><del>-    return m_networkSession && m_networkProcess->privateClickMeasurementEnabled() && !m_sessionID.isEphemeral();
</del><ins>+    return m_client->featureEnabled();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool PrivateClickMeasurementManager::debugModeEnabled() const
</span><span class="cx"> {
</span><del>-    return m_networkProcess->privateClickMeasurementDebugModeEnabled() && !m_sessionID.isEphemeral();
</del><ins>+    return m_client->debugModeEnabled();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void PrivateClickMeasurementManager::markAttributedPrivateClickMeasurementsAsExpiredForTesting(CompletionHandler<void()>&& completionHandler)
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessPrivateClickMeasurementManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurementManager.h (281943 => 281944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurementManager.h      2021-09-02 18:53:37 UTC (rev 281943)
+++ trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurementManager.h 2021-09-02 18:57:34 UTC (rev 281944)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include "NetworkLoadParameters.h"
</span><span class="cx"> #include "NetworkProcess.h"
</span><ins>+#include "PrivateClickMeasurementClient.h"
</ins><span class="cx"> #include "PrivateClickMeasurementStore.h"
</span><span class="cx"> #include <WebCore/PrivateClickMeasurement.h>
</span><span class="cx"> #include <WebCore/RegistrableDomain.h>
</span><span class="lines">@@ -49,11 +50,10 @@
</span><span class="cx"> 
</span><span class="cx">     using AttributionDestinationSite = WebCore::PrivateClickMeasurement::AttributionDestinationSite;
</span><span class="cx">     using AttributionTriggerData = WebCore::PrivateClickMeasurement::AttributionTriggerData;
</span><del>-    using NetworkLoadCallback = CompletionHandler<void(const WebCore::ResourceError&, const WebCore::ResourceResponse&, const RefPtr<JSON::Object>&)>;
</del><span class="cx">     using PrivateClickMeasurement = WebCore::PrivateClickMeasurement;
</span><span class="cx">     using RegistrableDomain = WebCore::RegistrableDomain;
</span><span class="cx">     using SourceSite = WebCore::PrivateClickMeasurement::SourceSite;
</span><del>-    explicit PrivateClickMeasurementManager(NetworkSession&, NetworkProcess&, PAL::SessionID, const String& storageDirectory, Function<void(NetworkLoadParameters&&, NetworkLoadCallback&&)>&&);
</del><ins>+    explicit PrivateClickMeasurementManager(UniqueRef<PCM::Client>&&, const String& storageDirectory);
</ins><span class="cx"> 
</span><span class="cx">     void storeUnattributed(PrivateClickMeasurement&&);
</span><span class="cx">     void handleAttribution(AttributionTriggerData&&, const URL& requestURL, const WebCore::ResourceRequest& redirectRequest);
</span><span class="lines">@@ -94,12 +94,9 @@
</span><span class="cx">     bool m_isRunningEphemeralMeasurementTest { false };
</span><span class="cx">     std::optional<URL> m_tokenPublicKeyURLForTesting;
</span><span class="cx">     std::optional<URL> m_tokenSignatureURLForTesting;
</span><del>-    WeakPtr<NetworkSession> m_networkSession;
-    Ref<NetworkProcess> m_networkProcess;
-    PAL::SessionID m_sessionID;
</del><span class="cx">     mutable RefPtr<PCM::Store> m_store;
</span><span class="cx">     String m_storageDirectory;
</span><del>-    Function<void(NetworkLoadParameters&&, NetworkLoadCallback&&)> m_networkLoadFunction;
</del><ins>+    UniqueRef<PCM::Client> m_client;
</ins><span class="cx"> 
</span><span class="cx">     struct AttributionReportTestConfig {
</span><span class="cx">         URL attributionReportSourceURL;
</span></span></pre></div>
<a id="trunkSourceWebKitSourcestxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Sources.txt (281943 => 281944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Sources.txt  2021-09-02 18:53:37 UTC (rev 281943)
+++ trunk/Source/WebKit/Sources.txt     2021-09-02 18:57:34 UTC (rev 281944)
</span><span class="lines">@@ -99,6 +99,7 @@
</span><span class="cx"> NetworkProcess/IndexedDB/WebIDBConnectionToClient.cpp
</span><span class="cx"> NetworkProcess/IndexedDB/WebIDBServer.cpp
</span><span class="cx"> 
</span><ins>+NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementClientImpl.cpp
</ins><span class="cx"> NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDatabase.cpp
</span><span class="cx"> NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDebugInfo.cpp
</span><span class="cx"> NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementStore.cpp
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (281943 => 281944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj     2021-09-02 18:53:37 UTC (rev 281943)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj        2021-09-02 18:57:34 UTC (rev 281944)
</span><span class="lines">@@ -4553,6 +4553,9 @@
</span><span class="cx">          5CB7AFE423C67D6400E49CF3 /* APIResourceLoadInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIResourceLoadInfo.h; sourceTree = "<group>"; };
</span><span class="cx">          5CB7AFE523C67DF900E49CF3 /* _WKResourceLoadInfoInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKResourceLoadInfoInternal.h; sourceTree = "<group>"; };
</span><span class="cx">          5CB7AFE623C681B000E49CF3 /* ResourceLoadInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceLoadInfo.h; sourceTree = "<group>"; };
</span><ins>+               5CB930BF26E0542E0032B1C0 /* PrivateClickMeasurementClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrivateClickMeasurementClient.h; sourceTree = "<group>"; };
+               5CB930C026E0542F0032B1C0 /* PrivateClickMeasurementClientImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PrivateClickMeasurementClientImpl.cpp; sourceTree = "<group>"; };
+               5CB930C126E054B80032B1C0 /* PrivateClickMeasurementClientImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrivateClickMeasurementClientImpl.h; sourceTree = "<group>"; };
</ins><span class="cx">           5CBC9B891C6524A500A8FDCF /* NetworkDataTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkDataTask.h; sourceTree = "<group>"; };
</span><span class="cx">          5CBC9B8B1C65257300A8FDCF /* NetworkDataTaskCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkDataTaskCocoa.mm; sourceTree = "<group>"; };
</span><span class="cx">          5CBE908F26D7FB62005A2E95 /* PrivateClickMeasurementDebugInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrivateClickMeasurementDebugInfo.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -9262,6 +9265,9 @@
</span><span class="cx">          5C01BC3526D46AD400FEB42F /* PrivateClickMeasurement */ = {
</span><span class="cx">                  isa = PBXGroup;
</span><span class="cx">                  children = (
</span><ins>+                               5CB930BF26E0542E0032B1C0 /* PrivateClickMeasurementClient.h */,
+                               5CB930C026E0542F0032B1C0 /* PrivateClickMeasurementClientImpl.cpp */,
+                               5CB930C126E054B80032B1C0 /* PrivateClickMeasurementClientImpl.h */,
</ins><span class="cx">                           5C826D6A26D482EA008AEC91 /* PrivateClickMeasurementDatabase.cpp */,
</span><span class="cx">                          5C826D6926D482EA008AEC91 /* PrivateClickMeasurementDatabase.h */,
</span><span class="cx">                          5CBE909026D7FB7C005A2E95 /* PrivateClickMeasurementDebugInfo.cpp */,
</span></span></pre>
</div>
</div>

</body>
</html>