Remove dependency on the DevTools agent for console logs.

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 5fadcf6837e27d97df027ba2cdd3a5ca5f575121..ccb899d895cc1f6835f240f8c139a59e93d09b2c 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -163,6 +163,7 @@
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/platform/modules/webusb/WebUSBClient.h"
 #include "third_party/WebKit/public/web/WebColorSuggestion.h"
+#include "third_party/WebKit/public/web/WebConsoleMessage.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebFindOptions.h"
 #include "third_party/WebKit/public/web/WebFrameSerializer.h"
@@ -792,6 +793,22 @@ bool UseMojoCdm() {
 }
 #endif  // defined(ENABLE_MOJO_CDM)
 
+blink::WebConsoleMessage::Level TranslateConsoleLevel(
+    const ConsoleMessageLevel level) {
+  switch (level) {
+    case CONSOLE_MESSAGE_LEVEL_DEBUG:
+      return blink::WebConsoleMessage::LevelDebug;
+    case CONSOLE_MESSAGE_LEVEL_LOG:
+      return blink::WebConsoleMessage::LevelLog;
+    case CONSOLE_MESSAGE_LEVEL_WARNING:
+      return blink::WebConsoleMessage::LevelWarning;
+    case CONSOLE_MESSAGE_LEVEL_ERROR:
+      return blink::WebConsoleMessage::LevelError;
+  }
+  NOTREACHED();
+  return blink::WebConsoleMessage::LevelLog;
+}
+
 }  // namespace
 
 // static
@@ -1407,6 +1424,8 @@ bool RenderFrameImpl::OnMessageReceived(const IPC::Message& msg) {
                         OnExecuteNoValueEditCommand)
     IPC_MESSAGE_HANDLER(FrameMsg_CSSInsertRequest, OnCSSInsertRequest)
     IPC_MESSAGE_HANDLER(FrameMsg_AddMessageToConsole, OnAddMessageToConsole)
+    IPC_MESSAGE_HANDLER(FrameMsg_AddSecurityMessageToConsole,
+                        OnAddSecurityMessageToConsole)
     IPC_MESSAGE_HANDLER(FrameMsg_JavaScriptExecuteRequest,
                         OnJavaScriptExecuteRequest)
     IPC_MESSAGE_HANDLER(FrameMsg_JavaScriptExecuteRequestForTests,
@@ -1796,6 +1815,15 @@ void RenderFrameImpl::OnAddMessageToConsole(ConsoleMessageLevel level,
   AddMessageToConsole(level, message);
 }
 
+void RenderFrameImpl::OnAddSecurityMessageToConsole(
+    ConsoleMessageLevel level,
+    const std::string& message) {
+  blink::WebConsoleMessage wcm(TranslateConsoleLevel(level),
+                               WebString::fromUTF8(message));
+  wcm.source = blink::WebConsoleMessage::Source::Security;
+  frame_->addMessageToConsole(wcm);
+}
+
 void RenderFrameImpl::OnJavaScriptExecuteRequest(
     const base::string16& jscript,
     int id,
@@ -2357,8 +2385,11 @@ void RenderFrameImpl::EnsureMojoBuiltinsAreAvailable(
 
 void RenderFrameImpl::AddMessageToConsole(ConsoleMessageLevel level,
                                           const std::string& message) {
-  if (devtools_agent_)
-    devtools_agent_->AddMessageToConsole(level, message);
+  if (devtools_agent_) {

[pfeldman, 2016/04/21 21:48:30]

This was already always true, but now you don't even use it below.

[carlosk, 2016/04/22 14:33:55]

As explained, this was not always true, for instance, whne running layout tests.

+    blink::WebConsoleMessage wcm(TranslateConsoleLevel(level),
+                                 WebString::fromUTF8(message));
+    frame_->addMessageToConsole(wcm);
+  }
 }
 
 bool RenderFrameImpl::IsUsingLoFi() const {