| Index: extensions/common/stack_frame.cc
|
| diff --git a/extensions/common/stack_frame.cc b/extensions/common/stack_frame.cc
|
| index 046a2652250e31f318f2afe620140c5f7c9940de..497edac45ea21381526d1521851c449d1ea3498f 100644
|
| --- a/extensions/common/stack_frame.cc
|
| +++ b/extensions/common/stack_frame.cc
|
| @@ -45,7 +45,7 @@ StackFrame::~StackFrame() {
|
| // (We have to recognize two formats because V8 will report stack traces in
|
| // both ways. If we reconcile this, we can clean this up.)
|
| // static
|
| -scoped_ptr<StackFrame> StackFrame::CreateFromText(
|
| +std::unique_ptr<StackFrame> StackFrame::CreateFromText(
|
| const base::string16& frame_text) {
|
| // We need to use utf8 for re2 matching.
|
| std::string text = base::UTF16ToUTF8(frame_text);
|
| @@ -60,13 +60,11 @@ scoped_ptr<StackFrame> StackFrame::CreateFromText(
|
| !re2::RE2::FullMatch(text,
|
| "([^\\(\\)]+):(\\d+):(\\d+)",
|
| &source, &line, &column)) {
|
| - return scoped_ptr<StackFrame>();
|
| + return std::unique_ptr<StackFrame>();
|
| }
|
|
|
| - return scoped_ptr<StackFrame>(new StackFrame(line,
|
| - column,
|
| - base::UTF8ToUTF16(source),
|
| - base::UTF8ToUTF16(function)));
|
| + return std::unique_ptr<StackFrame>(new StackFrame(
|
| + line, column, base::UTF8ToUTF16(source), base::UTF8ToUTF16(function)));
|
| }
|
|
|
| bool StackFrame::operator==(const StackFrame& rhs) const {
|
|
|