1 files changed, 11 insertions, 20 deletions

diff --git a/chromium/net/cookies/first_party_set_metadata.h b/chromium/net/cookies/first_party_set_metadata.h
index 1b6562d2713..5d54d5564ac 100644
--- a/chromium/net/cookies/first_party_set_metadata.h
+++ b/chromium/net/cookies/first_party_set_metadata.h
@@ -5,9 +5,8 @@
 #ifndef NET_COOKIES_FIRST_PARTY_SET_METADATA_H_
 #define NET_COOKIES_FIRST_PARTY_SET_METADATA_H_
 
-#include "base/stl_util.h"
 #include "net/base/net_export.h"
-#include "net/base/schemeful_site.h"
+#include "net/cookies/first_party_set_entry.h"
 #include "net/cookies/same_party_context.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
@@ -19,14 +18,12 @@ class NET_EXPORT FirstPartySetMetadata {
  public:
   FirstPartySetMetadata();
 
-  // `frame_owner` and `top_frame_owner` must live for the duration of the ctor;
+  // `frame_entry` and `top_frame_entry` must live for the duration of the ctor;
   // nullptr indicates that there's no First-Party Set that's associated with
   // the current frame or the top frame, respectively, in the given context.
-  FirstPartySetMetadata(
-      const SamePartyContext& context,
-      const SchemefulSite* frame_owner,
-      const SchemefulSite* top_frame_owner,
-      FirstPartySetsContextType first_party_sets_context_type);
+  FirstPartySetMetadata(const SamePartyContext& context,
+                        const FirstPartySetEntry* frame_entry,
+                        const FirstPartySetEntry* top_frame_entry);
 
   FirstPartySetMetadata(FirstPartySetMetadata&&);
   FirstPartySetMetadata& operator=(FirstPartySetMetadata&&);
@@ -39,23 +36,17 @@ class NET_EXPORT FirstPartySetMetadata {
 
   // Returns a optional<T>& instead of a T* so that operator== can be defined
   // more easily.
-  const absl::optional<SchemefulSite>& frame_owner() const {
-    return frame_owner_;
+  const absl::optional<FirstPartySetEntry>& frame_entry() const {
+    return frame_entry_;
   }
-  const absl::optional<SchemefulSite>& top_frame_owner() const {
-    return top_frame_owner_;
-  }
-
-  FirstPartySetsContextType first_party_sets_context_type() const {
-    return first_party_sets_context_type_;
+  const absl::optional<FirstPartySetEntry>& top_frame_entry() const {
+    return top_frame_entry_;
   }
 
  private:
   SamePartyContext context_ = SamePartyContext();
-  absl::optional<SchemefulSite> frame_owner_ = absl::nullopt;
-  absl::optional<SchemefulSite> top_frame_owner_ = absl::nullopt;
-  FirstPartySetsContextType first_party_sets_context_type_ =
-      FirstPartySetsContextType::kUnknown;
+  absl::optional<FirstPartySetEntry> frame_entry_ = absl::nullopt;
+  absl::optional<FirstPartySetEntry> top_frame_entry_ = absl::nullopt;
 };
 
 NET_EXPORT std::ostream& operator<<(std::ostream& os,