[DevTools] Filter any messages from previous sessions in DevToolsAgentHostImpl

content/browser/devtools/protocol/page_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/page_handler.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 254 matching lines @@
   for (int i = 0; i != controller.GetEntryCount(); ++i) {
     if (controller.GetEntryAtIndex(i)->GetUniqueID() == entry_id) {
       controller.GoToIndex(i);
       return Response::OK();
     }
   }
 
   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();
 }
 
 Response PageHandler::CanScreencast(bool* result) {
 #if defined(OS_ANDROID)
   *result = true;
 #else
   *result = false;
 #endif  // defined(OS_ANDROID)
   return Response::OK();
@@ skipping 192 matching lines @@
           ->set_device_height(screen_size_dip.height())
           ->set_scroll_offset_x(metadata.root_scroll_offset.x())
           ->set_scroll_offset_y(metadata.root_scroll_offset.y())
           ->set_timestamp(timestamp.ToDoubleT());
   client_->ScreencastFrame(ScreencastFrameParams::Create()
       ->set_data(data)
       ->set_metadata(param_metadata)
       ->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;
   }
 
   std::string base_64_data;
   base::Base64Encode(
       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));
 }
 
 void PageHandler::OnColorPicked(int r, int g, int b, int a) {
   scoped_refptr<dom::RGBA> color =
       dom::RGBA::Create()->set_r(r)->set_g(g)->set_b(b)->set_a(a);
   client_->ColorPicked(ColorPickedParams::Create()->set_color(color));
 }
 
 }  // namespace page
 }  // namespace devtools
 }  // namespace content