DevTools: Fix getCookies to report for all resources

content/browser/devtools/protocol/network_handler.cc

 // Copyright 2014 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/devtools/protocol/network_handler.h"
 
 #include <stddef.h>
 
 #include "base/containers/hash_tables.h"
 #include "base/strings/stringprintf.h"
@@ skipping 192 matching lines @@
   }
 
   std::unique_ptr<Callback> callback_;
   int request_count_;
   base::hash_map<std::string, net::CanonicalCookie> cookies_;
 };
 
 class GetCookiesCommand : public GetCookiesCommandBase<GetCookiesCallback> {
  public:
   GetCookiesCommand(RenderFrameHostImpl* frame_host,
+                    std::unique_ptr<protocol::Array<std::string>> urls,
                     std::unique_ptr<GetCookiesCallback> callback)
       : GetCookiesCommandBase(std::move(callback)) {
     net::CookieStore::GetCookieListCallback got_cookies_callback = base::Bind(
         &GetCookiesCommand::GotCookiesForURL, base::Unretained(this));
 
-    std::queue<FrameTreeNode*> queue;
-    queue.push(frame_host->frame_tree_node());
-    while (!queue.empty()) {
-      FrameTreeNode* node = queue.front();
-      queue.pop();
-
-      // Only traverse nodes with the same local root.
-      if (node->current_frame_host()->IsCrossProcessSubframe())
-        continue;
+    for (size_t i = 0; i < urls->length(); i++) {
       ++request_count_;
       BrowserThread::PostTask(

[pfeldman, 2017/01/13 02:17:34]

You should not post as many tasks as there are urls, pass array into a single
task instead.

Also, you might need to maintain existing behavior of url gathering in case no
urls are given in the protocol command. So you can gather first and post the
task after.

[phulce, 2017/01/18 00:52:34]

Done.

           BrowserThread::IO, FROM_HERE,
           base::Bind(&GetCookiesForURLOnIO,
                      base::Unretained(frame_host->GetSiteInstance()
                                           ->GetBrowserContext()
                                           ->GetResourceContext()),
                      base::Unretained(frame_host->GetProcess()
                                           ->GetStoragePartition()
                                           ->GetURLRequestContext()),
-                     node->current_url(), got_cookies_callback));
-
-      for (size_t i = 0; i < node->child_count(); ++i)
-        queue.push(node->child_at(i));
+                     GURL(urls->get(i)), got_cookies_callback));
     }
   }
 };
 
 class GetAllCookiesCommand
     : public GetCookiesCommandBase<GetAllCookiesCallback> {
  public:
   GetAllCookiesCommand(RenderFrameHostImpl* frame_host,
                        std::unique_ptr<GetAllCookiesCallback> callback)
       : GetCookiesCommandBase(std::move(callback)) {
@@ skipping 57 matching lines @@
   return Response::OK();
 }
 
 Response NetworkHandler::ClearBrowserCookies() {
   if (host_)
     GetContentClient()->browser()->ClearCookies(host_);
   return Response::OK();
 }
 
 void NetworkHandler::GetCookies(
+    std::unique_ptr<protocol::Array<std::string>> urls,
     std::unique_ptr<GetCookiesCallback> callback) {
   if (!host_)
     callback->sendFailure(Response::InternalError());
   else
-    new GetCookiesCommand(host_, std::move(callback));
+    new GetCookiesCommand(host_, std::move(urls), std::move(callback));
 }
 
 void NetworkHandler::GetAllCookies(
     std::unique_ptr<GetAllCookiesCallback> callback) {
   if (!host_)
     callback->sendFailure(Response::InternalError());
   else
     new GetAllCookiesCommand(host_, std::move(callback));
 }
 
@@ skipping 72 matching lines @@
   *result = false;
   return Response::OK();
 }
 
 std::string NetworkHandler::UserAgentOverride() const {
   return enabled_ ? user_agent_ : std::string();
 }
 
 }  // namespace protocol
 }  // namespace content