[DevTools] Filter any messages from previous sessions in DevToolsAgentHostImpl

content/browser/devtools/protocol/page_handler.cc

Index: content/browser/devtools/protocol/page_handler.cc
diff --git a/content/browser/devtools/protocol/page_handler.cc b/content/browser/devtools/protocol/page_handler.cc
index c1e88169d5d9d4dbf8734971433842f5c782986c..a179d0086b4d87638c25eafc329d2b26313e225c 100644
--- a/content/browser/devtools/protocol/page_handler.cc
+++ b/content/browser/devtools/protocol/page_handler.cc
@@ -272,13 +272,14 @@ Response PageHandler::NavigateToHistoryEntry(int entry_id) {
   return Response::InvalidParams("No entry with passed id");
 }
 
-Response PageHandler::CaptureScreenshot(DevToolsCommandId command_id) {
+Response PageHandler::CaptureScreenshot(int session_id,
+                                        DevToolsCommandId command_id) {
   if (!host_ || !host_->GetRenderWidgetHost())
     return Response::InternalError("Could not connect to view");
 
   host_->GetRenderWidgetHost()->GetSnapshotFromBrowser(
-      base::Bind(&PageHandler::ScreenshotCaptured,
-          weak_factory_.GetWeakPtr(), command_id));
+      base::Bind(&PageHandler::ScreenshotCaptured, weak_factory_.GetWeakPtr(),
+                 session_id, command_id));
   return Response::OK();
 }
 
@@ -491,11 +492,12 @@ void PageHandler::ScreencastFrameEncoded(
       ->set_frame_number(++screencast_frame_sent_));
 }
 
-void PageHandler::ScreenshotCaptured(DevToolsCommandId command_id,
+void PageHandler::ScreenshotCaptured(int session_id,
+                                     DevToolsCommandId command_id,
                                      const unsigned char* png_data,
                                      size_t png_size) {
   if (!png_data || !png_size) {
-    client_->SendError(command_id,
+    client_->SendError(session_id, command_id,
                        Response::InternalError("Unable to capture screenshot"));
     return;
   }
@@ -505,7 +507,8 @@ void PageHandler::ScreenshotCaptured(DevToolsCommandId command_id,
       base::StringPiece(reinterpret_cast<const char*>(png_data), png_size),
       &base_64_data);
 
-  client_->SendCaptureScreenshotResponse(command_id,
+  client_->SendCaptureScreenshotResponse(
+      session_id, command_id,
       CaptureScreenshotResponse::Create()->set_data(base_64_data));
 }