Provide child/frame IDs for WebSocket handshake request

android_webview/browser/aw_cookie_access_policy.cc

 // Copyright (c) 2012 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 "android_webview/browser/aw_cookie_access_policy.h"
 
 #include <memory>
 
 #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/resource_request_info.h"
+#include "content/public/browser/websocket_handshake_request_info.h"
 #include "net/base/net_errors.h"
 
 using base::AutoLock;
 using content::BrowserThread;
 using content::ResourceRequestInfo;
+using content::WebSocketHandshakeRequestInfo;
 using net::StaticCookiePolicy;
 
 namespace android_webview {
 
 namespace {
 base::LazyInstance<AwCookieAccessPolicy>::Leaky g_lazy_instance;
 }  // namespace
 
 AwCookieAccessPolicy::~AwCookieAccessPolicy() {
 }
@@ skipping 22 matching lines @@
   std::unique_ptr<AwContentsIoThreadClient> io_thread_client =
       AwContentsIoThreadClient::FromID(render_process_id, render_frame_id);
   if (!io_thread_client) {
     return false;
   }
   return io_thread_client->ShouldAcceptThirdPartyCookies();
 }
 
 bool AwCookieAccessPolicy::GetShouldAcceptThirdPartyCookies(
     const net::URLRequest& request) {
+  bool has_id = false;
+  int child_id = 0;
+  int frame_id = 0;
   const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(&request);
-  if (!info) {
+  if (info) {
+    has_id = true;
+    child_id = info->GetChildID();
+    frame_id = info->GetRenderFrameID();
+  } else {
+    const WebSocketHandshakeRequestInfo* websocketInfo =

[Adam Rice, 2016/10/12 06:38:25]

s/websocketInfo/websocket_info/?

[yhirano, 2016/10/12 10:47:15]

Done.

+        WebSocketHandshakeRequestInfo::ForRequest(&request);
+    if (websocketInfo) {

[Adam Rice, 2016/10/12 06:38:25]

Maybe instead write

if (!websocket_info)
  return false;

and then remove the has_id variable?

[yhirano, 2016/10/12 10:47:15]

Done.

+      has_id = true;
+      child_id = websocketInfo->GetChildId();
+      frame_id = websocketInfo->GetFrameId();
+    }
+  }
+  if (!has_id)
     return false;
-  }
-  return GetShouldAcceptThirdPartyCookies(info->GetChildID(),
-                                          info->GetRenderFrameID());
+  return GetShouldAcceptThirdPartyCookies(child_id, frame_id);
 }
 
 bool AwCookieAccessPolicy::OnCanGetCookies(const net::URLRequest& request,
                                            const net::CookieList& cookie_list) {
   bool global = GetShouldAcceptCookies();
   bool thirdParty = GetShouldAcceptThirdPartyCookies(request);
   return AwStaticCookiePolicy(global, thirdParty)
       .AllowGet(request.url(), request.first_party_for_cookies());
 }
 
@@ skipping 60 matching lines @@
          net::OK;
 }
 
 bool AwStaticCookiePolicy::AllowGet(const GURL& url,
                                     const GURL& first_party) const {
   return StaticCookiePolicy(GetPolicy(url)).CanGetCookies(url, first_party) ==
          net::OK;
 }
 
 }  // namespace android_webview