Rename first-party-only cookies to same-site cookies.

net/url_request/url_request_http_job.cc

Index: net/url_request/url_request_http_job.cc
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index b7606d3cfd4149f1a9e7a87cf7114bc238f6a86f..bcb9446f8e760a7ce674c65bf673bb2607573c1d 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -684,19 +684,19 @@ void URLRequestHttpJob::DoLoadCookies() {
   CookieOptions options;
   options.set_include_httponly();
 
-  // TODO(mkwst): If first-party-only cookies aren't enabled, pretend the
-  // request is first-party regardless, in order to include all cookies. Drop
-  // this check once we decide whether or not we're shipping this feature:
+  // TODO(mkwst): If same-site cookies aren't enabled, pretend the request is
+  // same-site regardless, in order to include all cookies. Drop this check once
+  // we decide whether or not we're shipping this feature:
   // https://crbug.com/459154
   url::Origin requested_origin(request_->url());
   if (!network_delegate() ||
       !network_delegate()->AreExperimentalCookieFeaturesEnabled()) {
-    options.set_include_first_party_only_cookies();
+    options.set_include_samesite();
   } else if (requested_origin.IsSameOriginWith(
                  url::Origin(request_->first_party_for_cookies())) &&

[mmenke, 2016/01/25 18:47:10]

Should first_party_for_cookies be renamed to same_site_for_cookies?

[Mike West, 2016/01/26 11:05:45]

Maybe. Our UI still talks about blocking "third-party" cookies, but there's
probably value in being consistent with the naming. I'll talk to UI folks. Would
you mind deferring that to a separate discussion/CL?

              (IsMethodSafe(request_->method()) ||
               requested_origin.IsSameOriginWith(request_->initiator()))) {
-    options.set_include_first_party_only_cookies();
+    options.set_include_samesite();
   }
 
   request_->context()->cookie_store()->GetCookiesWithOptionsAsync(