Extend PR_ParseTimeString() to accept some ISO 8601 formats to fix timezone parsing in SyslogParser.

chrome/browser/extensions/api/log_private/syslog_parser.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 "chrome/browser/extensions/api/log_private/syslog_parser.h"
 
 #include <string>
 #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"
 #include "base/strings/string_tokenizer.h"
 #include "base/time/time.h"
 #include "chrome/browser/extensions/api/log_private/filter_handler.h"
 #include "chrome/browser/extensions/api/log_private/log_parser.h"
 #include "chrome/browser/extensions/api/log_private/log_private_api.h"
 #include "chrome/common/extensions/api/log_private.h"
 
 namespace extensions {
 
 namespace {
 
-const int kExpectedTimeTokenNum = 7;
-const char kLogEntryDelimiters[] = "-:T";
 const char kProcessInfoDelimiters[] = "[]";
 
 }  // namespace
 
 SyslogParser::SyslogParser() {}
 
 SyslogParser::~SyslogParser() {}
 
 SyslogParser::Error SyslogParser::ParseEntry(
     const std::string& input,
@@ skipping 26 matching lines @@
   ParseLevel(input, entry.get());
   entry->full_entry = input;
 
   if (filter_handler->IsValidLogEntry(*(entry.get()))) {
     output->push_back(entry);
   }
 
   return SyslogParser::SUCCESS;
 }
 
-SyslogParser::Error ParseTimeHelper(base::StringTokenizer* tokenizer,
-                                    std::string* output) {
-  if (!tokenizer->GetNext()) {
-    LOG(ERROR) << "Error when parsing time";
-    return SyslogParser::PARSE_ERROR;
-  }
-  *output = tokenizer->token();
-  return SyslogParser::SUCCESS;
-}
-
 SyslogParser::Error SyslogParser::ParseTime(const std::string& input,
                                             double* output) const {
-  base::StringTokenizer tokenizer(input, kLogEntryDelimiters);
-  std::string tokens[kExpectedTimeTokenNum];
-  for (int i = 0; i < kExpectedTimeTokenNum; i++) {
-    if (ParseTimeHelper(&tokenizer, &(tokens[i])) != SyslogParser::SUCCESS)
-      return SyslogParser::PARSE_ERROR;
-  }
-
-  std::string buffer = tokens[1] + '-' + tokens[2] + '-' + tokens[0] + ' ' +
-                       tokens[3] + ':' + tokens[4] + ":00";
-
   base::Time parsed_time;
-  if (!base::Time::FromString(buffer.c_str(), &parsed_time)) {
+  if (!base::Time::FromString(input.c_str(), &parsed_time)) {
     LOG(ERROR) << "Error when parsing time";
     return SyslogParser::PARSE_ERROR;
   }
 
-  double seconds;
-  base::StringToDouble(tokens[5], &seconds);
-  *output = parsed_time.ToJsTime() +
-            (seconds * base::Time::kMillisecondsPerSecond);
-
+  *output = parsed_time.ToJsTime();
   return SyslogParser::SUCCESS;
 }
 
 SyslogParser::Error SyslogParser::ParseProcess(
     const std::string& input,
     api::log_private::LogEntry* entry) const {
   base::StringTokenizer tokenizer(input, kProcessInfoDelimiters);
   if (!tokenizer.GetNext()) {
     LOG(ERROR)
         << "Error when parsing data. Expect: At least 1 token. Actual: 0";
@@ skipping 18 matching lines @@
   } else if (input.find("WARN") != std::string::npos) {
     entry->level = "warning";
   } else if (input.find("INFO") != std::string::npos) {
     entry->level = "info";
   } else {
     entry->level = "unknown";
   }
 }
 
 }  // namespace extensions