[inspector] Cleanup inspector test

test/inspector/isolate-data.cc

 // Copyright 2017 the V8 project 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 "test/inspector/isolate-data.h"
 
+#include "src/inspector/test-interface.h"
 #include "test/inspector/task-runner.h"
 
 namespace {
 
 const int kIsolateDataIndex = 2;
 const int kContextGroupIdIndex = 3;
 
 v8::internal::Vector<uint16_t> ToVector(v8::Local<v8::String> str) {
   v8::internal::Vector<uint16_t> buffer =
       v8::internal::Vector<uint16_t>::New(str->Length());
@@ skipping 14 matching lines @@
                                       static_cast<int>(string.length()))
         .ToLocalChecked();
 }
 
 void Print(v8::Isolate* isolate, const v8_inspector::StringView& string) {
   v8::Local<v8::String> v8_string = ToString(isolate, string);
   v8::String::Utf8Value utf8_string(v8_string);
   fwrite(*utf8_string, sizeof(**utf8_string), utf8_string.length(), stdout);
 }
 
-class ChannelImpl final : public v8_inspector::V8Inspector::Channel {
- public:
-  ChannelImpl(IsolateData::FrontendChannel* frontend_channel, int session_id)
-      : frontend_channel_(frontend_channel), session_id_(session_id) {}
-  virtual ~ChannelImpl() = default;
-
- private:
-  void sendResponse(
-      int callId,
-      std::unique_ptr<v8_inspector::StringBuffer> message) override {
-    frontend_channel_->SendMessageToFrontend(session_id_, message->string());
-  }
-  void sendNotification(
-      std::unique_ptr<v8_inspector::StringBuffer> message) override {
-    frontend_channel_->SendMessageToFrontend(session_id_, message->string());
-  }
-  void flushProtocolNotifications() override {}
-
-  IsolateData::FrontendChannel* frontend_channel_;
-  int session_id_;
-  DISALLOW_COPY_AND_ASSIGN(ChannelImpl);
-};
-
 }  //  namespace
 
 IsolateData::IsolateData(TaskRunner* task_runner,
                          IsolateData::SetupGlobalTasks setup_global_tasks,
-                         v8::StartupData* startup_data,
-                         FrontendChannel* channel)
+                         v8::StartupData* startup_data, bool with_inspector)
     : task_runner_(task_runner),
-      setup_global_tasks_(std::move(setup_global_tasks)),
-      frontend_channel_(channel) {
+      setup_global_tasks_(std::move(setup_global_tasks)) {
   v8::Isolate::CreateParams params;
   params.array_buffer_allocator =
       v8::ArrayBuffer::Allocator::NewDefaultAllocator();
   params.snapshot_blob = startup_data;
   isolate_ = v8::Isolate::New(params);
   isolate_->SetMicrotasksPolicy(v8::MicrotasksPolicy::kScoped);
-  if (frontend_channel_) {
+  if (with_inspector) {
     isolate_->AddMessageListener(&IsolateData::MessageHandler);
     inspector_ = v8_inspector::V8Inspector::create(isolate_, this);
   }
 }
 
 IsolateData* IsolateData::FromContext(v8::Local<v8::Context> context) {
   return static_cast<IsolateData*>(
       context->GetAlignedPointerFromEmbedderData(kIsolateDataIndex));
 }
 
@@ skipping 44 matching lines @@
 // static
 v8::MaybeLocal<v8::Module> IsolateData::ModuleResolveCallback(
     v8::Local<v8::Context> context, v8::Local<v8::String> specifier,
     v8::Local<v8::Module> referrer) {
   std::string str = *v8::String::Utf8Value(specifier);
   IsolateData* data = IsolateData::FromContext(context);
   return data->modules_[ToVector(specifier)].Get(data->isolate_);
 }
 
 int IsolateData::ConnectSession(int context_group_id,
-                                const v8_inspector::StringView& state) {
+                                const v8_inspector::StringView& state,
+                                v8_inspector::V8Inspector::Channel* channel) {
   int session_id = ++last_session_id_;
-  channels_[session_id].reset(new ChannelImpl(frontend_channel_, session_id));
-  sessions_[session_id] =
-      inspector_->connect(context_group_id, channels_[session_id].get(), state);
+  sessions_[session_id] = inspector_->connect(context_group_id, channel, state);
   context_group_by_session_[sessions_[session_id].get()] = context_group_id;
   return session_id;
 }
 
 std::unique_ptr<v8_inspector::StringBuffer> IsolateData::DisconnectSession(
     int session_id) {
   auto it = sessions_.find(session_id);
   CHECK(it != sessions_.end());
   context_group_by_session_.erase(it->second.get());
   std::unique_ptr<v8_inspector::StringBuffer> result = it->second->stateJSON();
   sessions_.erase(it);
-  channels_.erase(session_id);
   return result;
 }
 
 void IsolateData::SendMessage(int session_id,
                               const v8_inspector::StringView& message) {
   auto it = sessions_.find(session_id);
   if (it != sessions_.end()) it->second->dispatchProtocolMessage(message);
 }
 
 void IsolateData::BreakProgram(int context_group_id,
@@ skipping 15 matching lines @@
   }
 }
 
 void IsolateData::CancelPauseOnNextStatement(int context_group_id) {
   for (int session_id : GetSessionIds(context_group_id)) {
     auto it = sessions_.find(session_id);
     if (it != sessions_.end()) it->second->cancelPauseOnNextStatement();
   }
 }
 
+void IsolateData::AsyncTaskScheduled(const v8_inspector::StringView& name,
+                                     void* task, bool recurring) {
+  inspector_->asyncTaskScheduled(name, task, recurring);
+}
+
+void IsolateData::AsyncTaskStarted(void* task) {
+  inspector_->asyncTaskStarted(task);
+}
+
+void IsolateData::AsyncTaskFinished(void* task) {
+  inspector_->asyncTaskFinished(task);
+}
+
+void IsolateData::SetMaxAsyncTaskStacksForTest(int limit) {
+  v8_inspector::SetMaxAsyncTaskStacksForTest(inspector_.get(), limit);
+}
+
+void IsolateData::DumpAsyncTaskStacksStateForTest() {
+  v8_inspector::DumpAsyncTaskStacksStateForTest(inspector_.get());
+}
+
 // static
 void IsolateData::MessageHandler(v8::Local<v8::Message> message,
                                  v8::Local<v8::Value> exception) {
   v8::Isolate* isolate = v8::Isolate::GetCurrent();
   v8::Local<v8::Context> context = isolate->GetEnteredContext();
   if (context.IsEmpty()) return;
   v8_inspector::V8Inspector* inspector =
       IsolateData::FromContext(context)->inspector_.get();
 
   v8::Local<v8::StackTrace> stack = message->GetStackTrace();
@@ skipping 100 matching lines @@
                                     unsigned lineNumber, unsigned columnNumber,
                                     v8_inspector::V8StackTrace* stack) {
   if (!log_console_api_message_calls_) return;
   Print(isolate_, message);
   fprintf(stdout, " (");
   Print(isolate_, url);
   fprintf(stdout, ":%d:%d)", lineNumber, columnNumber);
   Print(isolate_, stack->toString()->string());
   fprintf(stdout, "\n");
 }