[DevTools] Filter any messages from previous sessions in DevToolsAgentHostImpl

content/browser/devtools/protocol/tracing_handler.cc

Index: content/browser/devtools/protocol/tracing_handler.cc
diff --git a/content/browser/devtools/protocol/tracing_handler.cc b/content/browser/devtools/protocol/tracing_handler.cc
index 3518ed5e9962112041960417cc7a86f3d03cf37d..646888f411f6bab9f5242e31f681bcbc06d3f2d3 100644
--- a/content/browser/devtools/protocol/tracing_handler.cc
+++ b/content/browser/devtools/protocol/tracing_handler.cc
@@ -113,7 +113,7 @@ void TracingHandler::OnTraceDataCollected(const std::string& trace_fragment) {
   message.reserve(message.size() + trace_fragment.size() + messageSuffixSize);
   message += trace_fragment;
   message += "] } }";
-  client_->SendRawMessage(message);
+  client_->SendRawMessage(0, message);
 }
 
 void TracingHandler::OnTraceComplete() {
@@ -125,7 +125,8 @@ void TracingHandler::OnTraceToStreamComplete(const std::string& stream_handle) {
       TracingCompleteParams::Create()->set_stream(stream_handle));
 }
 
-Response TracingHandler::Start(DevToolsCommandId command_id,
+Response TracingHandler::Start(int session_id,
+                               DevToolsCommandId command_id,
                                const std::string* categories,
                                const std::string* options,
                                const double* buffer_usage_reporting_interval,
@@ -154,12 +155,11 @@ Response TracingHandler::Start(DevToolsCommandId command_id,
   TracingController::GetInstance()->EnableRecording(
       trace_config,
       base::Bind(&TracingHandler::OnRecordingEnabled,
-                 weak_factory_.GetWeakPtr(),
-                 command_id));
+                 weak_factory_.GetWeakPtr(), session_id, command_id));
   return Response::OK();
 }
 
-Response TracingHandler::End(DevToolsCommandId command_id) {
+Response TracingHandler::End(int session_id, DevToolsCommandId command_id) {
   // Startup tracing triggered by --trace-config-file is a special case, where
   // tracing is started automatically upon browser startup and can be stopped
   // via DevTools.
@@ -179,16 +179,17 @@ Response TracingHandler::End(DevToolsCommandId command_id) {
   return target_ == Renderer ? Response::FallThrough() : Response::OK();
 }
 
-Response TracingHandler::GetCategories(DevToolsCommandId command_id) {
+Response TracingHandler::GetCategories(int session_id,
+                                       DevToolsCommandId command_id) {
   TracingController::GetInstance()->GetCategories(
       base::Bind(&TracingHandler::OnCategoriesReceived,
-                 weak_factory_.GetWeakPtr(),
-                 command_id));
+                 weak_factory_.GetWeakPtr(), session_id, command_id));
   return Response::OK();
 }
 
-void TracingHandler::OnRecordingEnabled(DevToolsCommandId command_id) {
-  client_->SendStartResponse(command_id, StartResponse::Create());
+void TracingHandler::OnRecordingEnabled(int session_id,
+                                        DevToolsCommandId command_id) {
+  client_->SendStartResponse(session_id, command_id, StartResponse::Create());
 }
 
 void TracingHandler::OnBufferUsage(float percent_full,
@@ -202,16 +203,19 @@ void TracingHandler::OnBufferUsage(float percent_full,
 }
 
 void TracingHandler::OnCategoriesReceived(
+    int session_id,
     DevToolsCommandId command_id,
     const std::set<std::string>& category_set) {
   std::vector<std::string> categories;
   for (const std::string& category : category_set)
     categories.push_back(category);
-  client_->SendGetCategoriesResponse(command_id,
+  client_->SendGetCategoriesResponse(
+      session_id, command_id,
       GetCategoriesResponse::Create()->set_categories(categories));
 }
 
-Response TracingHandler::RequestMemoryDump(DevToolsCommandId command_id) {
+Response TracingHandler::RequestMemoryDump(int session_id,
+                                           DevToolsCommandId command_id) {
   if (!IsRecording())
     return Response::InternalError("Tracing is not started");
 
@@ -219,15 +223,16 @@ Response TracingHandler::RequestMemoryDump(DevToolsCommandId command_id) {
       base::trace_event::MemoryDumpType::EXPLICITLY_TRIGGERED,
       base::trace_event::MemoryDumpLevelOfDetail::DETAILED,
       base::Bind(&TracingHandler::OnMemoryDumpFinished,
-                 weak_factory_.GetWeakPtr(), command_id));
+                 weak_factory_.GetWeakPtr(), session_id, command_id));
   return Response::OK();
 }
 
-void TracingHandler::OnMemoryDumpFinished(DevToolsCommandId command_id,
+void TracingHandler::OnMemoryDumpFinished(int session_id,
+                                          DevToolsCommandId command_id,
                                           uint64 dump_guid,
                                           bool success) {
   client_->SendRequestMemoryDumpResponse(
-      command_id,
+      session_id, command_id,
       RequestMemoryDumpResponse::Create()
           ->set_dump_guid(base::StringPrintf("0x%" PRIx64, dump_guid))
           ->set_success(success));