[DevTools] Filter any messages from previous sessions in DevToolsAgentHostImpl

content/browser/devtools/protocol/network_handler.cc

Index: content/browser/devtools/protocol/network_handler.cc
diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/browser/devtools/protocol/network_handler.cc
index 27f82f45c8b171c833e778543875688727aeaba5..9e058a062240a13cc1f2c92ad9ad180695b15fd3 100644
--- a/content/browser/devtools/protocol/network_handler.cc
+++ b/content/browser/devtools/protocol/network_handler.cc
@@ -214,18 +214,18 @@ Response NetworkHandler::ClearBrowserCookies() {
   return Response::OK();
 }
 
-Response NetworkHandler::GetCookies(DevToolsCommandId command_id) {
+Response NetworkHandler::GetCookies(int session_id,
+                                    DevToolsCommandId command_id) {
   if (!host_)
     return Response::InternalError("Could not connect to view");
   new GetCookiesCommand(
-      host_,
-      base::Bind(&NetworkHandler::SendGetCookiesResponse,
-                 weak_factory_.GetWeakPtr(),
-                 command_id));
+      host_, base::Bind(&NetworkHandler::SendGetCookiesResponse,
+                        weak_factory_.GetWeakPtr(), session_id, command_id));
   return Response::OK();
 }
 
 void NetworkHandler::SendGetCookiesResponse(
+    int session_id,
     DevToolsCommandId command_id,
     const net::CookieList& cookie_list) {
   std::vector<scoped_refptr<Cookie>> cookies;
@@ -242,14 +242,15 @@ void NetworkHandler::SendGetCookiesResponse(
          ->set_secure(cookie.IsSecure())
          ->set_session(!cookie.IsPersistent()));
   }
-  client_->SendGetCookiesResponse(command_id,
+  client_->SendGetCookiesResponse(
+      session_id, command_id,
       GetCookiesResponse::Create()->set_cookies(cookies));
 }
 
-Response NetworkHandler::DeleteCookie(
-    DevToolsCommandId command_id,
-    const std::string& cookie_name,
-    const std::string& url) {
+Response NetworkHandler::DeleteCookie(int session_id,
+                                      DevToolsCommandId command_id,
+                                      const std::string& cookie_name,
+                                      const std::string& url) {
   if (!host_)
     return Response::InternalError("Could not connect to view");
   BrowserContext* browser_context =
@@ -257,18 +258,17 @@ Response NetworkHandler::DeleteCookie(
   int process_id = host_->GetProcess()->GetID();
   DeleteCookieOnUI(
       browser_context->GetResourceContext(),
-      browser_context->GetRequestContextForRenderProcess(process_id),
-      GURL(url),
+      browser_context->GetRequestContextForRenderProcess(process_id), GURL(url),
       cookie_name,
       base::Bind(&NetworkHandler::SendDeleteCookieResponse,
-                 weak_factory_.GetWeakPtr(),
-                 command_id));
+                 weak_factory_.GetWeakPtr(), session_id, command_id));
   return Response::OK();
 }
 
-void NetworkHandler::SendDeleteCookieResponse(DevToolsCommandId command_id) {
-  client_->SendDeleteCookieResponse(command_id,
-      DeleteCookieResponse::Create());
+void NetworkHandler::SendDeleteCookieResponse(int session_id,
+                                              DevToolsCommandId command_id) {
+  client_->SendDeleteCookieResponse(session_id, command_id,
+                                    DeleteCookieResponse::Create());
 }