Mark ChromeViewHostMsg_DetailedConsoleMessageAdded as extensions-only.

chrome/renderer/extensions/chrome_extensions_render_frame_observer.cc

Index: chrome/renderer/extensions/chrome_extensions_render_frame_observer.cc
diff --git a/chrome/renderer/extensions/chrome_extensions_render_frame_observer.cc b/chrome/renderer/extensions/chrome_extensions_render_frame_observer.cc
new file mode 100644
index 0000000000000000000000000000000000000000..adb04dc4a6d45e754e0ee4f31c286fe49b8d1923
--- /dev/null
+++ b/chrome/renderer/extensions/chrome_extensions_render_frame_observer.cc
@@ -0,0 +1,94 @@
+// 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 "chrome/renderer/extensions/chrome_extensions_render_frame_observer.h"
+
+#include "base/strings/string_split.h"
+#include "base/strings/utf_string_conversions.h"
+#include "chrome/common/render_messages.h"
+#include "extensions/common/stack_frame.h"
+
+namespace {

[Devlin, 2014/06/06 20:57:23]

please put all this in the extensions namespace.

[Lei Zhang, 2014/06/06 21:31:35]

Done.

+
+// The delimiter for a stack trace provided by WebKit.
+const char kStackFrameDelimiter[] = "\n    at ";
+
+// Get a stack trace from a WebKit console message.
+// There are three possible scenarios:
+// 1. WebKit gives us a stack trace in |stack_trace|.
+// 2. The stack trace is embedded in the error |message| by an internal
+//    script. This will be more useful than |stack_trace|, since |stack_trace|
+//    will include the internal bindings trace, instead of a developer's code.
+// 3. No stack trace is included. In this case, we should mock one up from
+//    the given line number and source.
+// |message| will be populated with the error message only (i.e., will not
+// include any stack trace).
+extensions::StackTrace GetStackTraceFromMessage(
+    base::string16* message,
+    const base::string16& source,
+    const base::string16& stack_trace,
+    int32 line_number) {
+  extensions::StackTrace result;
+  std::vector<base::string16> pieces;
+  size_t index = 0;
+
+  if (message->find(base::UTF8ToUTF16(kStackFrameDelimiter)) !=
+          base::string16::npos) {
+    base::SplitStringUsingSubstr(*message,
+                                 base::UTF8ToUTF16(kStackFrameDelimiter),
+                                 &pieces);
+    *message = pieces[0];
+    index = 1;
+  } else if (!stack_trace.empty()) {
+    base::SplitStringUsingSubstr(stack_trace,
+                                 base::UTF8ToUTF16(kStackFrameDelimiter),
+                                 &pieces);
+  }
+
+  // If we got a stack trace, parse each frame from the text.
+  if (index < pieces.size()) {
+    for (; index < pieces.size(); ++index) {
+      scoped_ptr<extensions::StackFrame> frame =
+          extensions::StackFrame::CreateFromText(pieces[index]);
+      if (frame.get())
+        result.push_back(*frame);
+    }
+  }
+
+  if (result.empty()) {  // If we don't have a stack trace, mock one up.
+    result.push_back(
+        extensions::StackFrame(line_number,
+                               1u,  // column number
+                               source,
+                               base::string16() /* no function name */ ));
+  }
+
+  return result;
+}
+
+}  // namespace
+
+ChromeExtensionsRenderFrameObserver::ChromeExtensionsRenderFrameObserver(
+    content::RenderFrame* render_frame)
+    : content::RenderFrameObserver(render_frame) {
+}
+
+ChromeExtensionsRenderFrameObserver::~ChromeExtensionsRenderFrameObserver() {
+}
+
+void ChromeExtensionsRenderFrameObserver::DetailedConsoleMessageAdded(
+    const base::string16& message,
+    const base::string16& source,
+    const base::string16& stack_trace_string,
+    int32 line_number,
+    int32 severity_level) {
+  base::string16 trimmed_message = message;
+  extensions::StackTrace stack_trace = GetStackTraceFromMessage(
+      &trimmed_message,
+      source,
+      stack_trace_string,
+      line_number);
+  Send(new ChromeViewHostMsg_DetailedConsoleMessageAdded(
+      routing_id(), trimmed_message, source, stack_trace, severity_level));
+}