[Extensions] Kill off ExtensionMsg_AddMessageToConsole

extensions/renderer/module_system.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 "extensions/renderer/module_system.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extensions_client.h"
 #include "extensions/renderer/console.h"
 #include "extensions/renderer/safe_builtins.h"
 #include "extensions/renderer/script_context.h"
+#include "extensions/renderer/script_context_set.h"
 #include "extensions/renderer/v8_helpers.h"
 #include "gin/modules/module_registry.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h"
 
 namespace extensions {
 
 using namespace v8_helpers;
 
 namespace {
@@ skipping 19 matching lines @@
   full_message += " context";
   if (context->extension()) {
     full_message += " for ";
     full_message += context->extension()->id();
   }
   full_message += ") ";
   full_message += message;
 
   ExtensionsClient* client = ExtensionsClient::Get();
   if (client->ShouldSuppressFatalErrors()) {
-    console::Error(context->isolate()->GetCallingContext(), full_message);
+    console::Error(context->GetRenderFrame(), full_message);
     client->RecordDidSuppressFatalError();
   } else {
-    console::Fatal(context->isolate()->GetCallingContext(), full_message);
+    console::Fatal(context->GetRenderFrame(), full_message);
   }
 }
 
 void Warn(v8::Isolate* isolate, const std::string& message) {
-  console::Warn(isolate->GetCallingContext(), message);
+  ScriptContext* script_context =
+      ScriptContextSet::GetContextByV8Context(isolate->GetCallingContext());
+  console::Warn(script_context ? script_context->GetRenderFrame() : nullptr,
+                message);
 }
 
 // Default exception handler which logs the exception.
 class DefaultExceptionHandler : public ModuleSystem::ExceptionHandler {
  public:
   explicit DefaultExceptionHandler(ScriptContext* context)
       : ModuleSystem::ExceptionHandler(context) {}
 
   // Fatally dumps the debug info from |try_catch| to the console.
   // Make sure this is never used for exceptions that originate in external
@@ skipping 656 matching lines @@
 
 void ModuleSystem::ClobberExistingNativeHandler(const std::string& name) {
   NativeHandlerMap::iterator existing_handler = native_handler_map_.find(name);
   if (existing_handler != native_handler_map_.end()) {
     clobbered_native_handlers_.push_back(existing_handler->second);
     native_handler_map_.erase(existing_handler);
   }
 }
 
 }  // namespace extensions