Fix third party cookies not being sent in WebView iframes.

The issue was in:
AwCookieAccessPolicy::GetShouldAcceptThirdPartyCookies()

AwContentsIoThreadClient::FromID(render_process_id, render_frame_id) was
used, but at this point a navigation request is not associated with a
renderer process yet. It caused the cookies not being sent with the
request.

The solution was to use
AwContentsIoThreadClient::FromID(frame_tree_node_id) instead.

Bug: 793648, 794939
Change-Id: I5bda7affab67645cfd64c105b06c8a628047dd79
Reviewed-on: https://chromium-review.googlesource.com/827018
Commit-Queue: Arthur Sonzogni <arthursonzogni@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#524098}

android_webview/browser/aw_cookie_access_policy.cc

@@ -9,6 +9,7 @@
 #include "android_webview/browser/aw_contents_io_thread_client.h"
 #include "base/logging.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/browser/websocket_handshake_request_info.h"
 #include "net/base/net_errors.h"
@@ -48,9 +49,14 @@ void AwCookieAccessPolicy::SetShouldAcceptCookies(bool allow) {
 
 bool AwCookieAccessPolicy::GetShouldAcceptThirdPartyCookies(
     int render_process_id,
-    int render_frame_id) {
+    int render_frame_id,
+    int frame_tree_node_id) {
   std::unique_ptr<AwContentsIoThreadClient> io_thread_client =
-      AwContentsIoThreadClient::FromID(render_process_id, render_frame_id);
+      (frame_tree_node_id != content::RenderFrameHost::kNoFrameTreeNodeId)
+          ? AwContentsIoThreadClient::FromID(frame_tree_node_id)
+          : AwContentsIoThreadClient::FromID(render_process_id,
+                                             render_frame_id);
+
   if (!io_thread_client) {
     return false;
   }
@@ -60,20 +66,23 @@ bool AwCookieAccessPolicy::GetShouldAcceptThirdPartyCookies(
 bool AwCookieAccessPolicy::GetShouldAcceptThirdPartyCookies(
     const net::URLRequest& request) {
   int child_id = 0;
-  int frame_id = 0;
+  int render_frame_id = 0;
+  int frame_tree_node_id = content::RenderFrameHost::kNoFrameTreeNodeId;
   const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(&request);
   if (info) {
     child_id = info->GetChildID();
-    frame_id = info->GetRenderFrameID();
+    render_frame_id = info->GetRenderFrameID();
+    frame_tree_node_id = info->GetFrameTreeNodeId();
   } else {
     const WebSocketHandshakeRequestInfo* websocket_info =
         WebSocketHandshakeRequestInfo::ForRequest(&request);
     if (!websocket_info)
       return false;
     child_id = websocket_info->GetChildId();
-    frame_id = websocket_info->GetRenderFrameId();
+    render_frame_id = websocket_info->GetRenderFrameId();
   }
-  return GetShouldAcceptThirdPartyCookies(child_id, frame_id);
+  return GetShouldAcceptThirdPartyCookies(child_id, render_frame_id,
+                                          frame_tree_node_id);
 }
 
 bool AwCookieAccessPolicy::OnCanGetCookies(const net::URLRequest& request,
@@ -100,8 +109,9 @@ bool AwCookieAccessPolicy::AllowGetCookie(const GURL& url,
                                           int render_process_id,
                                           int render_frame_id) {
   bool global = GetShouldAcceptCookies();
-  bool thirdParty =
-      GetShouldAcceptThirdPartyCookies(render_process_id, render_frame_id);
+  bool thirdParty = GetShouldAcceptThirdPartyCookies(
+      render_process_id, render_frame_id,
+      content::RenderFrameHost::kNoFrameTreeNodeId);
   return AwStaticCookiePolicy(global, thirdParty).AllowGet(url, first_party);
 }
 
@@ -113,8 +123,9 @@ bool AwCookieAccessPolicy::AllowSetCookie(const GURL& url,
                                           int render_frame_id,
                                           const net::CookieOptions& options) {
   bool global = GetShouldAcceptCookies();
-  bool thirdParty =
-      GetShouldAcceptThirdPartyCookies(render_process_id, render_frame_id);
+  bool thirdParty = GetShouldAcceptThirdPartyCookies(
+      render_process_id, render_frame_id,
+      content::RenderFrameHost::kNoFrameTreeNodeId);
   return AwStaticCookiePolicy(global, thirdParty).AllowSet(url, first_party);
 }
 

android_webview/browser/aw_cookie_access_policy.h

@@ -36,8 +36,12 @@ class AwCookieAccessPolicy {
   void SetShouldAcceptCookies(bool allow);
 
   // Can we read/write third party cookies?
+  // |render_process_id| and |render_frame_id| must be valid.
+  // Navigation requests are not associated with a renderer process. In this
+  // case, |frame_tree_node_id| must be valid instead.
   bool GetShouldAcceptThirdPartyCookies(int render_process_id,
-                                        int render_frame_id);
+                                        int render_frame_id,
+                                        int frame_tree_node_id);
   bool GetShouldAcceptThirdPartyCookies(const net::URLRequest& request);
 
   // These are the functions called when operating over cookies from the