SameSite: Strict/Lax behavior.

content/browser/frame_host/render_frame_message_filter.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/frame_host/render_frame_message_filter.h"
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_util.h"
@@ skipping 376 matching lines @@
 
   // If we crash here, figure out what URL the renderer was requesting.
   // http://crbug.com/99242
   char url_buf[128];
   base::strlcpy(url_buf, url.spec().c_str(), arraysize(url_buf));
   base::debug::Alias(url_buf);
 
   net::URLRequestContext* context = GetRequestContextForURL(url);
 
   net::CookieOptions options;
-  options.set_include_same_site();
+  options.set_same_site_mode(
+      net::CookieOptions::SameSiteMode::INCLUDE_STRICT_AND_LAX);

[mmenke, 2016/03/17 19:15:56]

Is this right?  Seems like for an iframe with an origin that doesn't match that
of one of its parent frames, this should be
net::CookieOptions::SameSiteMode::INCLUDE_LAX.

[Mike West, 2016/03/17 19:57:11]

Hrm. I think you're right, which is unfortunate, as it's going to make this more
complicated. Not much more complicated, though; we just need to compare the
registrable domains of |url| and |first_party_for_cookies|, as the latter takes
the kinds of things into account that you're mentioning.

[Mike West, 2016/03/18 14:27:17]

Done, and added a browser test to cover.

   context->cookie_store()->GetCookieListWithOptionsAsync(
       url, options,
       base::Bind(&RenderFrameMessageFilter::CheckPolicyForCookies, this,
                  render_frame_id, url, first_party_for_cookies, reply_msg));
 }
 
 void RenderFrameMessageFilter::OnCookiesEnabled(
     int render_frame_id,
     const GURL& url,
     const GURL& first_party_for_cookies,
@@ skipping 240 matching lines @@
   net::URLRequestContext* context =
       GetContentClient()->browser()->OverrideRequestContextForURL(
           url, resource_context_);
   if (!context)
     context = request_context_->GetURLRequestContext();
 
   return context;
 }
 
 }  // namespace content