Chromium Code Reviews| Index: chrome/browser/extensions/api/log_private/syslog_parser.cc |
| diff --git a/chrome/browser/extensions/api/log_private/syslog_parser.cc b/chrome/browser/extensions/api/log_private/syslog_parser.cc |
| index d5915334194aabb8d8ab6e37258bf8acd60ae9ea..4e9fe7b55106d48c526666a61d5592f03ca04ec8 100644 |
| --- a/chrome/browser/extensions/api/log_private/syslog_parser.cc |
| +++ b/chrome/browser/extensions/api/log_private/syslog_parser.cc |
| @@ -8,7 +8,6 @@ |
| #include <vector> |
| #include "base/logging.h" |
| -#include "base/memory/linked_ptr.h" |
| #include "base/memory/singleton.h" |
| #include "base/strings/string_number_conversions.h" |
| #include "base/strings/string_split.h" |
| @@ -33,9 +32,9 @@ SyslogParser::~SyslogParser() {} |
| SyslogParser::Error SyslogParser::ParseEntry( |
| const std::string& input, |
| - std::vector<linked_ptr<api::log_private::LogEntry> >* output, |
| + std::vector<api::log_private::LogEntry>* output, |
| FilterHandler* filter_handler) const { |
| - linked_ptr<api::log_private::LogEntry> entry(new api::log_private::LogEntry); |
| + api::log_private::LogEntry entry; |
|
stevenjb
2016/03/29 00:18:49
nit: move closer to where it is used
Devlin
2016/03/29 14:22:39
Done.
|
| base::StringTokenizer tokenizer(input, " "); |
| if (!tokenizer.GetNext()) { |
| @@ -44,7 +43,7 @@ SyslogParser::Error SyslogParser::ParseEntry( |
| return TOKENIZE_ERROR; |
| } |
| std::string time = tokenizer.token(); |
| - if (ParseTime(time, &(entry->timestamp)) != SyslogParser::SUCCESS) { |
| + if (ParseTime(time, &(entry.timestamp)) != SyslogParser::SUCCESS) { |
| return SyslogParser::PARSE_ERROR; |
| } |
| if (!tokenizer.GetNext()) { |
| @@ -52,12 +51,12 @@ SyslogParser::Error SyslogParser::ParseEntry( |
| << "Error when parsing data. Expect: At least 2 tokens. Actual: 1"; |
| return TOKENIZE_ERROR; |
| } |
| - ParseProcess(tokenizer.token(), entry.get()); |
| - ParseLevel(input, entry.get()); |
| - entry->full_entry = input; |
| + ParseProcess(tokenizer.token(), &entry); |
| + ParseLevel(input, &entry); |
| + entry.full_entry = input; |
| - if (filter_handler->IsValidLogEntry(*(entry.get()))) { |
| - output->push_back(entry); |
| + if (filter_handler->IsValidLogEntry(entry)) { |
| + output->push_back(std::move(entry)); |
| } |
| return SyslogParser::SUCCESS; |