[DevTools] Filter any messages from previous sessions in DevToolsAgentHostImpl

content/browser/devtools/devtools_protocol_handler.h

Index: content/browser/devtools/devtools_protocol_handler.h
diff --git a/content/browser/devtools/devtools_protocol_handler.h b/content/browser/devtools/devtools_protocol_handler.h
index 299b3423088457444fe78a3a471316fc16df10fa..b533470297d52fbb807ad59b75855bea84ba90bd 100644
--- a/content/browser/devtools/devtools_protocol_handler.h
+++ b/content/browser/devtools/devtools_protocol_handler.h
@@ -14,22 +14,27 @@ class DevToolsAgentHost;
 class DevToolsProtocolHandler {
  public:
   using Response = DevToolsProtocolClient::Response;
-  using Notifier = base::Callback<void(const std::string& message)>;
+  using Notifier =
+      base::Callback<void(int session_id, const std::string& message)>;

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

I think it's better to replace this Notifier by Delegate with two separate
methods for command result and notification.

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

Done.

 
   DevToolsProtocolHandler(DevToolsAgentHost* agent_host,
                           const Notifier& notifier);
   virtual ~DevToolsProtocolHandler();
 
-  void HandleMessage(const std::string& message);
-  bool HandleOptionalMessage(const std::string& message, int* call_id);
+  void HandleMessage(int session_id, const std::string& message);
+  bool HandleOptionalMessage(int session_id,
+                             const std::string& message,
+                             int* call_id);
 
   DevToolsProtocolDispatcher* dispatcher() { return &dispatcher_; }
 
  private:
-  scoped_ptr<base::DictionaryValue> ParseCommand(const std::string& message);
-  bool PassCommandToDelegate(base::DictionaryValue* command);
-  void HandleCommand(scoped_ptr<base::DictionaryValue> command);
-  bool HandleOptionalCommand(scoped_ptr<base::DictionaryValue> command,
+  scoped_ptr<base::DictionaryValue> ParseCommand(int session_id,
+                                                 const std::string& message);
+  bool PassCommandToDelegate(int session_id, base::DictionaryValue* command);
+  void HandleCommand(int session_id, scoped_ptr<base::DictionaryValue> command);
+  bool HandleOptionalCommand(int session_id,
+                             scoped_ptr<base::DictionaryValue> command,
                              int* call_id);
 
   DevToolsAgentHost* agent_host_;