| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "extensions/renderer/extensions_render_frame_observer.h" | 5 #include "extensions/renderer/extensions_render_frame_observer.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/strings/string_split.h" | 9 #include "base/strings/string_split.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 index = 1; | 47 index = 1; |
| 48 } else if (!stack_trace.empty()) { | 48 } else if (!stack_trace.empty()) { |
| 49 base::SplitStringUsingSubstr(stack_trace, | 49 base::SplitStringUsingSubstr(stack_trace, |
| 50 base::UTF8ToUTF16(kStackFrameDelimiter), | 50 base::UTF8ToUTF16(kStackFrameDelimiter), |
| 51 &pieces); | 51 &pieces); |
| 52 } | 52 } |
| 53 | 53 |
| 54 // If we got a stack trace, parse each frame from the text. | 54 // If we got a stack trace, parse each frame from the text. |
| 55 if (index < pieces.size()) { | 55 if (index < pieces.size()) { |
| 56 for (; index < pieces.size(); ++index) { | 56 for (; index < pieces.size(); ++index) { |
| 57 scoped_ptr<StackFrame> frame = StackFrame::CreateFromText(pieces[index]); | 57 std::unique_ptr<StackFrame> frame = |
| 58 StackFrame::CreateFromText(pieces[index]); |
| 58 if (frame.get()) | 59 if (frame.get()) |
| 59 result.push_back(*frame); | 60 result.push_back(*frame); |
| 60 } | 61 } |
| 61 } | 62 } |
| 62 | 63 |
| 63 if (result.empty()) { // If we don't have a stack trace, mock one up. | 64 if (result.empty()) { // If we don't have a stack trace, mock one up. |
| 64 result.push_back( | 65 result.push_back( |
| 65 StackFrame(line_number, | 66 StackFrame(line_number, |
| 66 1u, // column number | 67 1u, // column number |
| 67 source, | 68 source, |
| (...skipping 23 matching lines...) Expand all Loading... |
| 91 StackTrace stack_trace = GetStackTraceFromMessage( | 92 StackTrace stack_trace = GetStackTraceFromMessage( |
| 92 &trimmed_message, | 93 &trimmed_message, |
| 93 source, | 94 source, |
| 94 stack_trace_string, | 95 stack_trace_string, |
| 95 line_number); | 96 line_number); |
| 96 Send(new ExtensionHostMsg_DetailedConsoleMessageAdded( | 97 Send(new ExtensionHostMsg_DetailedConsoleMessageAdded( |
| 97 routing_id(), trimmed_message, source, stack_trace, severity_level)); | 98 routing_id(), trimmed_message, source, stack_trace, severity_level)); |
| 98 } | 99 } |
| 99 | 100 |
| 100 } // namespace extensions | 101 } // namespace extensions |
| OLD | NEW |