Rename "first_party_for_cookies" to "site_for_cookies".
This is consistent with the language used in
https://tools.ietf.org/html/draft-ietf-httpbis-cookie-same-site to
describe the difference in behavior for "same-site" and "cross-site"
requests, and more accurately describes the extent of the check
that's happening under the hood when users choose to "block
third-party cookies".
This change is completely mechanical, produced by the following:
git grep -n -l \
-e 'first_party_for_cookies' -e 'west-first-party-cookies' \
-e 'FirstPartyForCookies' -e 'firstPartyForCookies' -- \
"*.h" "*.hpp" "*.cpp" "*.c" "*.cc" "*.cpp" "*.inl" "*.grd" \
"*.idl" "*.m" "*.mm" "*.py" "*.sh" "*.cfg" "*.tac" "*.go" \
"*SConscript" "SConscript*" "*.scons" "*.vcproj" "*.vsprops" \
"*.make" "*.gyp" "*.gypi" "*.isolate" "*.js" "*.html" "*.css" \
"*.ebuild" "*.pl" "*.pm" \
| xargs -L1 sed -i '' \
-e 's/first_party_for_cookies/site_for_cookies/g' \
-e 's/west-first-party-cookies/ietf-httpbis-cookie-same-site/' \
-e 's/FirstPartyForCookies/SiteForCookies/g' \
-e 's/firstPartyforCookies/siteForCookies/g' \
&& git cl format
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_site_isolation
Change-Id: I8e6d48ae2ff15ba82b9d3b62d2a53faf4608819f
Reviewed-on: https://chromium-review.googlesource.com/590451
Commit-Queue: Mike West <[email protected]>
Reviewed-by: Ryan Sleevi <[email protected]>
Reviewed-by: Jochen Eisinger <[email protected]>
Cr-Commit-Position: refs/heads/master@{#493378}diff --git a/net/websockets/websocket_stream_cookie_test.cc b/net/websockets/websocket_stream_cookie_test.cc
index fbbee22..b013119 100644
--- a/net/websockets/websocket_stream_cookie_test.cc
+++ b/net/websockets/websocket_stream_cookie_test.cc
@@ -32,7 +32,7 @@
public:
void CreateAndConnect(const GURL& url,
const url::Origin& origin,
- const GURL& first_party_for_cookies,
+ const GURL& site_for_cookies,
const std::string& cookie_header,
const std::string& response_body) {
// We assume cookie_header ends with CRLF if not empty, as
@@ -46,8 +46,8 @@
cookie_header, std::string(),
std::string()),
response_body);
- CreateAndConnectStream(url, NoSubProtocols(), origin,
- first_party_for_cookies, "", nullptr);
+ CreateAndConnectStream(url, NoSubProtocols(), origin, site_for_cookies, "",
+ nullptr);
}
std::string AddCRLFIfNotEmpty(const std::string& s) {
@@ -130,7 +130,7 @@
const GURL url(GetParam().url);
const GURL cookie_url(GetParam().cookie_url);
const url::Origin origin(GURL("http://www.example.com"));
- const GURL first_party_for_cookies("http://www.example.com/");
+ const GURL site_for_cookies("http://www.example.com/");
const std::string cookie_line(GetParam().cookie_line);
const std::string cookie_header(AddCRLFIfNotEmpty(GetParam().cookie_header));
@@ -149,7 +149,7 @@
ASSERT_TRUE(is_called);
ASSERT_TRUE(set_cookie_result);
- CreateAndConnect(url, origin, first_party_for_cookies, cookie_header,
+ CreateAndConnect(url, origin, site_for_cookies, cookie_header,
WebSocketStandardResponse(""));
WaitUntilConnectDone();
EXPECT_FALSE(has_failed());
@@ -162,7 +162,7 @@
const GURL url(GetParam().url);
const GURL cookie_url(GetParam().cookie_url);
const url::Origin origin(GURL("http://www.example.com"));
- const GURL first_party_for_cookies("http://www.example.com/");
+ const GURL site_for_cookies("http://www.example.com/");
const std::string cookie_line(GetParam().cookie_line);
const std::string cookie_header(AddCRLFIfNotEmpty(GetParam().cookie_header));
@@ -178,7 +178,7 @@
CookieStore* store =
url_request_context_host_.GetURLRequestContext()->cookie_store();
- CreateAndConnect(url, origin, first_party_for_cookies, "", response);
+ CreateAndConnect(url, origin, site_for_cookies, "", response);
WaitUntilConnectDone();
EXPECT_FALSE(has_failed());
