diff options
Diffstat (limited to 'chromium/net/url_request/url_request_test_util.cc')
| -rw-r--r-- | chromium/net/url_request/url_request_test_util.cc | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/chromium/net/url_request/url_request_test_util.cc b/chromium/net/url_request/url_request_test_util.cc index 2c0b36aab42..83ae112f401 100644 --- a/chromium/net/url_request/url_request_test_util.cc +++ b/chromium/net/url_request/url_request_test_util.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -19,8 +19,8 @@ #include "net/cert/cert_verifier.h" #include "net/cert/ct_policy_enforcer.h" #include "net/cert/do_nothing_ct_verifier.h" -#include "net/cookies/same_party_context.h" #include "net/dns/mock_host_resolver.h" +#include "net/first_party_sets/same_party_context.h" #include "net/http/http_network_session.h" #include "net/http/http_response_headers.h" #include "net/http/http_server_properties.h" @@ -84,10 +84,8 @@ std::unique_ptr<URLRequestContextBuilder> CreateTestURLRequestContextBuilder() { builder->SetHttpAuthHandlerFactory(HttpAuthHandlerFactory::CreateDefault()); builder->SetHttpServerProperties(std::make_unique<HttpServerProperties>()); builder->set_quic_context(std::make_unique<QuicContext>()); - builder->SetCookieStore( - std::make_unique<CookieMonster>(/*store=*/nullptr, - /*netlog=*/nullptr, - /*first_party_sets_enabled=*/false)); + builder->SetCookieStore(std::make_unique<CookieMonster>(/*store=*/nullptr, + /*netlog=*/nullptr)); builder->set_http_user_agent_settings( std::make_unique<StaticHttpUserAgentSettings>("en-us,fr", std::string())); return builder; @@ -501,6 +499,7 @@ void TestNetworkDelegate::OnURLRequestDestroyed(URLRequest* request) { bool TestNetworkDelegate::OnAnnotateAndMoveUserBlockedCookies( const URLRequest& request, + const net::FirstPartySetMetadata& first_party_set_metadata, net::CookieAccessResultList& maybe_included_cookies, net::CookieAccessResultList& excluded_cookies) { bool allow = true; @@ -547,6 +546,14 @@ bool TestNetworkDelegate::OnCancelURLRequestWithPolicyViolatingReferrerHeader( return cancel_request_with_policy_violating_referrer_; } +absl::optional<FirstPartySetsCacheFilter::MatchInfo> +TestNetworkDelegate::OnGetFirstPartySetsCacheFilterMatchInfoMaybeAsync( + const SchemefulSite& request_site, + base::OnceCallback<void(FirstPartySetsCacheFilter::MatchInfo)> callback) + const { + return fps_cache_filter_.GetMatchInfo(request_site); +} + int TestNetworkDelegate::GetRequestId(URLRequest* request) { TestRequestId* test_request_id = reinterpret_cast<TestRequestId*>( request->GetUserData(kTestNetworkDelegateRequestIdKey)); @@ -597,6 +604,7 @@ FilteringTestNetworkDelegate::OnForcePrivacyMode( bool FilteringTestNetworkDelegate::OnAnnotateAndMoveUserBlockedCookies( const URLRequest& request, + const net::FirstPartySetMetadata& first_party_set_metadata, net::CookieAccessResultList& maybe_included_cookies, net::CookieAccessResultList& excluded_cookies) { // Filter out cookies if |block_annotate_cookies_| is set and @@ -630,7 +638,8 @@ bool FilteringTestNetworkDelegate::OnAnnotateAndMoveUserBlockedCookies( // Call the nested delegate's method first to avoid a short circuit. return TestNetworkDelegate::OnAnnotateAndMoveUserBlockedCookies( - request, maybe_included_cookies, excluded_cookies) && + request, first_party_set_metadata, maybe_included_cookies, + excluded_cookies) && allowed; } |