[DevTools] Filter any messages from previous sessions in DevToolsAgentHostImpl

content/browser/devtools/protocol/devtools_protocol_client.cc

Index: content/browser/devtools/protocol/devtools_protocol_client.cc
diff --git a/content/browser/devtools/protocol/devtools_protocol_client.cc b/content/browser/devtools/protocol/devtools_protocol_client.cc
index 4b7c25d6fe33a76ef730ea34e7e8b2313c93e11f..a4bb20dce9085f9e4877e27ab0ae561fb63a6557 100644
--- a/content/browser/devtools/protocol/devtools_protocol_client.cc
+++ b/content/browser/devtools/protocol/devtools_protocol_client.cc
@@ -40,14 +40,16 @@ DevToolsProtocolClient::DevToolsProtocolClient(
 DevToolsProtocolClient::~DevToolsProtocolClient() {
 }
 
-void DevToolsProtocolClient::SendRawMessage(const std::string& message) {
-  raw_message_callback_.Run(message);
+void DevToolsProtocolClient::SendRawMessage(int session_id,
+                                            const std::string& message) {
+  raw_message_callback_.Run(session_id, message);
 }
 
-void DevToolsProtocolClient::SendMessage(const base::DictionaryValue& message) {
+void DevToolsProtocolClient::SendMessage(int session_id,
+                                         const base::DictionaryValue& message) {
   std::string json_message;
   base::JSONWriter::Write(message, &json_message);
-  SendRawMessage(json_message);
+  SendRawMessage(session_id, json_message);
 }
 
 void DevToolsProtocolClient::SendNotification(
@@ -58,23 +60,27 @@ void DevToolsProtocolClient::SendNotification(
   if (params)
     notification.Set(kParamsParam, params.release());
 
-  SendMessage(notification);
+  SendMessage(0, notification);
 }
 
 void DevToolsProtocolClient::SendSuccess(
+    int session_id,
     DevToolsCommandId command_id,
     scoped_ptr<base::DictionaryValue> params) {
+  // TODO: pass

[dgozman, 2015/11/06 22:57:27]

remove

[kozy, 2015/11/07 01:54:44]

Done.

   base::DictionaryValue response;
   response.SetInteger(kIdParam, command_id);
 
   response.Set(kResultParam,
       params ? params.release() : new base::DictionaryValue());
 
-  SendMessage(response);
+  SendMessage(session_id, response);
 }
 
-bool DevToolsProtocolClient::SendError(DevToolsCommandId command_id,
+bool DevToolsProtocolClient::SendError(int session_id,
+                                       DevToolsCommandId command_id,
                                        const Response& response) {
+  // TODO: !

[dgozman, 2015/11/06 22:57:27]

remove

[kozy, 2015/11/07 01:54:43]

Done.

   if (response.status() == kStatusOk ||
       response.status() == kStatusFallThrough) {
     return false;
@@ -91,7 +97,7 @@ bool DevToolsProtocolClient::SendError(DevToolsCommandId command_id,
     error_object->SetString(kErrorMessageParam, response.message());
 
   dict.Set(kErrorParam, error_object);
-  SendMessage(dict);
+  SendMessage(session_id, dict);
   return true;
 }