Revert of [DevTools] Filter any messages from previous sessions in DevToolsAgentHostImpl

content/browser/devtools/protocol/devtools_protocol_client.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/protocol/devtools_protocol_client.h"
 
 #include "base/json/json_writer.h"
 #include "base/strings/stringprintf.h"
-#include "content/browser/devtools/protocol/devtools_protocol_delegate.h"
 
 namespace content {
 
 namespace {
 
 const char kIdParam[] = "id";
 const char kMethodParam[] = "method";
 const char kParamsParam[] = "params";
 const char kResultParam[] = "result";
 const char kErrorParam[] = "error";
 const char kErrorCodeParam[] = "code";
 const char kErrorMessageParam[] = "message";
 
 // Special values.
 const int kStatusOk = -1;
 const int kStatusFallThrough = -2;
 // JSON RPC 2.0 spec: http://www.jsonrpc.org/specification#error_object
 const int kStatusInvalidParams = -32602;
 const int kStatusInternalError = -32603;
 const int kStatusServerError = -32000;
 
 }  // namespace
 
 // static
-const int DevToolsCommandId::kNoId = -1;
+const DevToolsCommandId DevToolsProtocolClient::kNoId = -1;
 
 DevToolsProtocolClient::DevToolsProtocolClient(
-    DevToolsProtocolDelegate* notifier)
-    : notifier_(notifier) {}
+    const RawMessageCallback& raw_message_callback)
+    : raw_message_callback_(raw_message_callback) {
+}
 
 DevToolsProtocolClient::~DevToolsProtocolClient() {
 }
 
-void DevToolsProtocolClient::SendRawNotification(const std::string& message) {
-  notifier_->SendProtocolNotification(message);
+void DevToolsProtocolClient::SendRawMessage(const std::string& message) {
+  raw_message_callback_.Run(message);
 }
 
-void DevToolsProtocolClient::SendMessage(int session_id,
-                                         const base::DictionaryValue& message) {
+void DevToolsProtocolClient::SendMessage(const base::DictionaryValue& message) {
   std::string json_message;
   base::JSONWriter::Write(message, &json_message);
-  notifier_->SendProtocolResponse(session_id, json_message);
+  SendRawMessage(json_message);
 }
 
 void DevToolsProtocolClient::SendNotification(
     const std::string& method,
     scoped_ptr<base::DictionaryValue> params) {
   base::DictionaryValue notification;
   notification.SetString(kMethodParam, method);
   if (params)
     notification.Set(kParamsParam, params.release());
 
-  std::string json_message;
-  base::JSONWriter::Write(notification, &json_message);
-  SendRawNotification(json_message);
+  SendMessage(notification);
 }
 
 void DevToolsProtocolClient::SendSuccess(
     DevToolsCommandId command_id,
     scoped_ptr<base::DictionaryValue> params) {
   base::DictionaryValue response;
-  response.SetInteger(kIdParam, command_id.call_id);
+  response.SetInteger(kIdParam, command_id);
 
   response.Set(kResultParam,
       params ? params.release() : new base::DictionaryValue());
 
-  SendMessage(command_id.session_id, response);
+  SendMessage(response);
 }
 
 bool DevToolsProtocolClient::SendError(DevToolsCommandId command_id,
                                        const Response& response) {
   if (response.status() == kStatusOk ||
       response.status() == kStatusFallThrough) {
     return false;
   }
   base::DictionaryValue dict;
-  if (command_id.call_id == DevToolsCommandId::kNoId)
+  if (command_id == kNoId)
     dict.Set(kIdParam, base::Value::CreateNullValue());
   else
-    dict.SetInteger(kIdParam, command_id.call_id);
+    dict.SetInteger(kIdParam, command_id);
 
   base::DictionaryValue* error_object = new base::DictionaryValue();
   error_object->SetInteger(kErrorCodeParam, response.status());
   if (!response.message().empty())
     error_object->SetString(kErrorMessageParam, response.message());
 
   dict.Set(kErrorParam, error_object);
-  SendMessage(command_id.session_id, dict);
+  SendMessage(dict);
   return true;
 }
 
 typedef DevToolsProtocolClient::Response Response;
 
 Response Response::FallThrough() {
   return Response(kStatusFallThrough);
 }
 
 Response Response::OK() {
@@ skipping 28 matching lines @@
 Response::Response(int status)
     : status_(status) {
 }
 
 Response::Response(int status, const std::string& message)
     : status_(status),
       message_(message) {
 }
 
 }  // namespace content