1 files changed, 22 insertions, 20 deletions

diff --git a/chromium/net/reporting/reporting_header_parser.cc b/chromium/net/reporting/reporting_header_parser.cc
index 1dfd5e6d8a8..9bc7d46e766 100644
--- a/chromium/net/reporting/reporting_header_parser.cc
+++ b/chromium/net/reporting/reporting_header_parser.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
+// Copyright 2017 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -18,7 +18,7 @@
 #include "base/values.h"
 #include "net/base/features.h"
 #include "net/base/isolation_info.h"
-#include "net/base/network_isolation_key.h"
+#include "net/base/network_anonymization_key.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/reporting/reporting_cache.h"
 #include "net/reporting/reporting_context.h"
@@ -118,12 +118,13 @@ bool ProcessEndpoint(ReportingDelegate* delegate,
 // |value| is the parsed JSON value of the endpoint group tuple.
 // Returns true on successfully adding a non-empty group, or false if endpoint
 // group was discarded or processed as a deletion.
-bool ProcessEndpointGroup(ReportingDelegate* delegate,
-                          ReportingCache* cache,
-                          const NetworkIsolationKey& network_isolation_key,
-                          const url::Origin& origin,
-                          const base::Value& value,
-                          ReportingEndpointGroup* parsed_endpoint_group_out) {
+bool ProcessEndpointGroup(
+    ReportingDelegate* delegate,
+    ReportingCache* cache,
+    const NetworkAnonymizationKey& network_anonymization_key,
+    const url::Origin& origin,
+    const base::Value& value,
+    ReportingEndpointGroup* parsed_endpoint_group_out) {
   const base::Value::Dict* dict = value.GetIfDict();
   if (!dict)
     return false;
@@ -134,7 +135,7 @@ bool ProcessEndpointGroup(ReportingDelegate* delegate,
       return false;
     group_name = maybe_group_name->GetString();
   }
-  ReportingEndpointGroupKey group_key(network_isolation_key, origin,
+  ReportingEndpointGroupKey group_key(network_anonymization_key, origin,
                                       group_name);
   parsed_endpoint_group_out->group_key = group_key;
 
@@ -216,14 +217,14 @@ bool ProcessEndpoint(ReportingDelegate* delegate,
 bool ProcessV1Endpoint(ReportingDelegate* delegate,
                        ReportingCache* cache,
                        const base::UnguessableToken& reporting_source,
-                       const NetworkIsolationKey& network_isolation_key,
+                       const NetworkAnonymizationKey& network_anonymization_key,
                        const url::Origin& origin,
                        const std::string& endpoint_name,
                        const std::string& endpoint_url_string,
                        ReportingEndpoint& parsed_endpoint_out) {
   DCHECK(!reporting_source.is_empty());
-  ReportingEndpointGroupKey group_key(network_isolation_key, reporting_source,
-                                      origin, endpoint_name);
+  ReportingEndpointGroupKey group_key(network_anonymization_key,
+                                      reporting_source, origin, endpoint_name);
   parsed_endpoint_out.group_key = group_key;
 
   ReportingEndpoint::EndpointInfo parsed_endpoint;
@@ -276,7 +277,7 @@ void ReportingHeaderParser::RecordReportingHeaderType(
 // static
 void ReportingHeaderParser::ParseReportToHeader(
     ReportingContext* context,
-    const NetworkIsolationKey& network_isolation_key,
+    const NetworkAnonymizationKey& network_anonymization_key,
     const url::Origin& origin,
     const base::Value::List& list) {
   DCHECK(GURL::SchemeIsCryptographic(origin.scheme()));
@@ -288,7 +289,7 @@ void ReportingHeaderParser::ParseReportToHeader(
 
   for (const auto& group_value : list) {
     ReportingEndpointGroup parsed_endpoint_group;
-    if (ProcessEndpointGroup(delegate, cache, network_isolation_key, origin,
+    if (ProcessEndpointGroup(delegate, cache, network_anonymization_key, origin,
                              group_value, &parsed_endpoint_group)) {
       parsed_header.push_back(std::move(parsed_endpoint_group));
     }
@@ -300,13 +301,13 @@ void ReportingHeaderParser::ParseReportToHeader(
 
   // Remove the client if it has no valid endpoint groups.
   if (parsed_header.empty()) {
-    cache->RemoveClient(network_isolation_key, origin);
+    cache->RemoveClient(network_anonymization_key, origin);
     return;
   }
 
   RecordReportingHeaderType(ReportingHeaderType::kReportTo);
 
-  cache->OnParsedHeader(network_isolation_key, origin,
+  cache->OnParsedHeader(network_anonymization_key, origin,
                         std::move(parsed_header));
 }
 
@@ -315,14 +316,15 @@ void ReportingHeaderParser::ProcessParsedReportingEndpointsHeader(
     ReportingContext* context,
     const base::UnguessableToken& reporting_source,
     const IsolationInfo& isolation_info,
-    const NetworkIsolationKey& network_isolation_key,
+    const NetworkAnonymizationKey& network_anonymization_key,
     const url::Origin& origin,
     base::flat_map<std::string, std::string> header) {
   DCHECK(base::FeatureList::IsEnabled(net::features::kDocumentReporting));
   DCHECK(GURL::SchemeIsCryptographic(origin.scheme()));
   DCHECK(!reporting_source.is_empty());
-  DCHECK(network_isolation_key.IsEmpty() ||
-         network_isolation_key == isolation_info.network_isolation_key());
+  DCHECK(network_anonymization_key.IsEmpty() ||
+         network_anonymization_key ==
+             isolation_info.network_anonymization_key());
 
   ReportingDelegate* delegate = context->delegate();
   ReportingCache* cache = context->cache();
@@ -332,7 +334,7 @@ void ReportingHeaderParser::ProcessParsedReportingEndpointsHeader(
   for (const auto& member : header) {
     ReportingEndpoint parsed_endpoint;
     if (ProcessV1Endpoint(delegate, cache, reporting_source,
-                          network_isolation_key, origin, member.first,
+                          network_anonymization_key, origin, member.first,
                           member.second, parsed_endpoint)) {
       parsed_header.push_back(std::move(parsed_endpoint));
     }