[DevTools] Make DevToolsSession own it's DevToolsMessageChunkProcessor

content/browser/devtools/worker_devtools_agent_host.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/worker_devtools_agent_host.h"
 
 #include "base/guid.h"
 #include "base/memory/ptr_util.h"
 #include "content/browser/devtools/devtools_session.h"
 #include "content/browser/devtools/protocol/inspector_handler.h"
@@ skipping 47 matching lines @@
   int call_id = 0;
   std::string method;
   if (session->Dispatch(message, &call_id, &method) !=
       protocol::Response::kFallThrough) {
     return true;
   }
 
   if (RenderProcessHost* host = RenderProcessHost::FromID(worker_id_.first)) {
     host->Send(new DevToolsAgentMsg_DispatchOnInspectorBackend(
         worker_id_.second, session->session_id(), call_id, method, message));
+    session->waiting_messages()[call_id] = {method, message};
   }
   return true;
 }
 
 bool WorkerDevToolsAgentHost::OnMessageReceived(
     const IPC::Message& msg) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(WorkerDevToolsAgentHost, msg)
   IPC_MESSAGE_HANDLER(DevToolsClientMsg_DispatchOnInspectorFrontend,
@@ skipping 17 matching lines @@
   return state_ == WORKER_INSPECTED || state_ == WORKER_UNINSPECTED ||
          state_ == WORKER_READY_FOR_DEBUG_ON_START;
 }
 
 void WorkerDevToolsAgentHost::WorkerReadyForInspection() {
   if (state_ == WORKER_PAUSED_FOR_REATTACH) {
     DCHECK(IsAttached());
     state_ = WORKER_INSPECTED;
     AttachToWorker();
     if (RenderProcessHost* host = RenderProcessHost::FromID(worker_id_.first)) {
-      host->Send(new DevToolsAgentMsg_Reattach(
-          worker_id_.second, GetId(), session()->session_id(),
-          chunk_processor_.state_cookie()));
+      host->Send(new DevToolsAgentMsg_Reattach(worker_id_.second, GetId(),
+                                               session()->session_id(),
+                                               session()->state_cookie()));
+      for (const auto& pair : session()->waiting_messages()) {
+        int call_id = pair.first;
+        const DevToolsSession::Message& message = pair.second;
+        host->Send(new DevToolsAgentMsg_DispatchOnInspectorBackend(
+            worker_id_.second, session()->session_id(), call_id, message.method,
+            message.message));
+      }
     }
     OnAttachedStateChanged(true);
   } else if (state_ == WORKER_PAUSED_FOR_DEBUG_ON_START) {
     state_ = WORKER_READY_FOR_DEBUG_ON_START;
   }
 }
 
 void WorkerDevToolsAgentHost::WorkerRestarted(WorkerId worker_id) {
   DCHECK_EQ(WORKER_TERMINATED, state_);
   state_ = IsAttached() ? WORKER_PAUSED_FOR_REATTACH : WORKER_UNINSPECTED;
@@ skipping 12 matching lines @@
   state_ = WORKER_TERMINATED;
   Release();  // Balanced in WorkerCreated().
 }
 
 bool WorkerDevToolsAgentHost::IsTerminated() {
   return state_ == WORKER_TERMINATED;
 }
 
 WorkerDevToolsAgentHost::WorkerDevToolsAgentHost(WorkerId worker_id)
     : DevToolsAgentHostImpl(base::GenerateGUID()),
-      chunk_processor_(base::Bind(&WorkerDevToolsAgentHost::SendMessageToClient,
-                                  base::Unretained(this))),
       state_(WORKER_UNINSPECTED),
       worker_id_(worker_id) {
   WorkerCreated();
 }
 
 WorkerDevToolsAgentHost::~WorkerDevToolsAgentHost() {
   DCHECK_EQ(WORKER_TERMINATED, state_);
 }
 
 void WorkerDevToolsAgentHost::OnAttachedStateChanged(bool attached) {
@@ skipping 10 matching lines @@
 }
 
 void WorkerDevToolsAgentHost::WorkerCreated() {
   AddRef();  // Balanced in WorkerDestroyed()
 }
 
 void WorkerDevToolsAgentHost::OnDispatchOnInspectorFrontend(
     const DevToolsMessageChunk& message) {
   if (!IsAttached())
     return;
-
-  chunk_processor_.ProcessChunkedMessageFromAgent(message);
+  session()->ReceiveMessageChunk(message);
 }
 
 }  // namespace content