Remove dependency on the DevTools agent for console logs.

content/renderer/render_frame_impl.cc

 // Copyright 2013 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/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 145 matching lines @@
 #include "third_party/WebKit/public/platform/WebMediaPlayerSource.h"
 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
 #include "third_party/WebKit/public/platform/WebStorageQuotaCallbacks.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/platform/WebURLError.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 #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"
 #include "third_party/WebKit/public/web/WebFrameWidget.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h"
 #include "third_party/WebKit/public/web/WebNavigationPolicy.h"
 #include "third_party/WebKit/public/web/WebPlugin.h"
 #include "third_party/WebKit/public/web/WebPluginContainer.h"
@@ skipping 609 matching lines @@
 // default.
 bool UseMojoCdm() {
 #if defined(OS_ANDROID)
   return media::IsUnifiedMediaPipelineEnabled();
 #else
   return true;
 #endif
 }
 #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
 RenderFrameImpl* RenderFrameImpl::Create(RenderViewImpl* render_view,
                                          int32_t routing_id) {
   DCHECK(routing_id != MSG_ROUTING_NONE);
   CreateParams params(render_view, routing_id);
 
   if (g_create_render_frame_impl)
     return g_create_render_frame_impl(params);
@@ skipping 595 matching lines @@
     IPC_MESSAGE_HANDLER(InputMsg_Replace, OnReplace)
     IPC_MESSAGE_HANDLER(InputMsg_ReplaceMisspelling, OnReplaceMisspelling)
     IPC_MESSAGE_HANDLER(InputMsg_ExtendSelectionAndDelete,
                         OnExtendSelectionAndDelete)
     IPC_MESSAGE_HANDLER(InputMsg_SetCompositionFromExistingText,
                         OnSetCompositionFromExistingText)
     IPC_MESSAGE_HANDLER(InputMsg_ExecuteNoValueEditCommand,
                         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,
                         OnJavaScriptExecuteRequestForTests)
     IPC_MESSAGE_HANDLER(FrameMsg_JavaScriptExecuteRequestInIsolatedWorld,
                         OnJavaScriptExecuteRequestInIsolatedWorld)
     IPC_MESSAGE_HANDLER(FrameMsg_VisualStateRequest,
                         OnVisualStateRequest)
     IPC_MESSAGE_HANDLER(FrameMsg_SetEditableSelectionOffsets,
                         OnSetEditableSelectionOffsets)
@@ skipping 369 matching lines @@
 
 void RenderFrameImpl::OnCSSInsertRequest(const std::string& css) {
   frame_->document().insertStyleSheet(WebString::fromUTF8(css));
 }
 
 void RenderFrameImpl::OnAddMessageToConsole(ConsoleMessageLevel level,
                                             const std::string& message) {
   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,
     bool notify_result) {
   TRACE_EVENT_INSTANT0("test_tracing", "OnJavaScriptExecuteRequest",
                        TRACE_EVENT_SCOPE_THREAD);
 
   v8::HandleScope handle_scope(v8::Isolate::GetCurrent());
   v8::Local<v8::Value> result =
       frame_->executeScriptAndReturnValue(WebScriptSource(jscript));
@@ skipping 541 matching lines @@
           .ToV8());
   registry->AddBuiltinModule(
       isolate, ServiceRegistryJsWrapper::kPerProcessModuleName,
       ServiceRegistryJsWrapper::Create(
           isolate, context, RenderThread::Get()->GetServiceRegistry())
           .ToV8());
 }
 
 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 {
   return is_using_lofi_;
 }
 
 bool RenderFrameImpl::IsPasting() const {
   return is_pasting_;
 }
 
@@ skipping 3668 matching lines @@
                                     int match_count,
                                     int ordinal,
                                     const WebRect& selection_rect,
                                     bool final_status_update) {
   Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
                                    selection_rect, ordinal,
                                    final_status_update));
 }
 
 }  // namespace content