[DevTools] Make DevToolsSession own it's DevToolsMessageChunkProcessor

content/browser/devtools/render_frame_devtools_agent_host.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_BROWSER_DEVTOOLS_RENDER_FRAME_DEVTOOLS_AGENT_HOST_H_
 #define CONTENT_BROWSER_DEVTOOLS_RENDER_FRAME_DEVTOOLS_AGENT_HOST_H_
 
 #include <map>
 #include <memory>
-#include <unordered_set>
 
 #include "base/compiler_specific.h"
+#include "base/containers/flat_set.h"
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "content/browser/devtools/devtools_agent_host_impl.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "net/base/net_errors.h"
 
 #if defined(OS_ANDROID)
 #include "ui/android/view_android.h"
 #endif  // OS_ANDROID
@@ skipping 141 matching lines @@
 #if defined(OS_ANDROID)
   device::mojom::WakeLockPtr wake_lock_;
 #endif
   RenderFrameHostImpl* handlers_frame_host_;
   bool current_frame_crashed_;
 
   // PlzNavigate
 
   // The active host we are talking to.
   RenderFrameHostImpl* frame_host_ = nullptr;
+  base::flat_set<NavigationHandleImpl*> navigation_handles_;
+  bool render_frame_alive_ = false;
+
+  // These messages were queued after suspending, not sent to the agent,
+  // and will be sent after resuming.
   struct Message {
     int session_id;
+    int call_id;
     std::string method;
     std::string message;
   };
-  // Chunk processor's state cookie always corresponds to a state before
-  // any of the suspended or waiting for response messages have been handled.
-  DevToolsMessageChunkProcessor chunk_processor_;
-  std::unordered_set<NavigationHandleImpl*> navigation_handles_;
-  bool render_frame_alive_ = false;
-  // These messages were sent before suspending, but their result have not been
-  // received yet, and state cookie has not been updated.
-  std::map<int, Message> waiting_for_response_messages_;
-  // These messages were queued after suspending, not sent to the agent,
-  // and will be sent after resuming.
-  std::map<int, Message> suspended_messages_;
+  std::vector<Message> suspended_messages_;
 
   // The FrameTreeNode associated with this agent.
   FrameTreeNode* frame_tree_node_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameDevToolsAgentHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_DEVTOOLS_RENDER_FRAME_DEVTOOLS_AGENT_HOST_H_