1 files changed, 17 insertions, 18 deletions
diff --git a/chrome/browser/extensions/api/log_private/syslog_parser_unittest.cc b/chrome/browser/extensions/api/log_private/syslog_parser_unittest.cc
index 2c0b8f0..2830818 100644
--- a/chrome/browser/extensions/api/log_private/syslog_parser_unittest.cc
+++ b/chrome/browser/extensions/api/log_private/syslog_parser_unittest.cc
@@ -2,28 +2,24 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <stdio.h>
 #include <string>
 #include <vector>
 
-#include "base/json/json_writer.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/values.h"
+#include "base/memory/linked_ptr.h"
 #include "chrome/browser/extensions/api/log_private/filter_handler.h"
-#include "chrome/browser/extensions/api/log_private/log_private_api.h"
+#include "chrome/browser/extensions/api/log_private/log_parser.h"
 #include "chrome/browser/extensions/api/log_private/syslog_parser.h"
-#include "chrome/common/extensions/api/log_private.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 namespace {
 
 const char kShillLogEntry[] =
-    "2013-07-08T11:28:12.440308-07:00 localhost shill:"
+    "2013-07-08T11:28:12.440308+02:00 localhost shill:"
     "[0708/112812:ERROR:manager.cc(480)] Skipping unload of service";
 
 const char kWpaSupplicantLogEntry[] =
-    "2013-07-08T12:39:07.443100-07:00 localhost wpa_supplicant[894]:"
+    "2013-07-18T12:39:07.443100-07:00 localhost wpa_supplicant[894]:"
     "dbus: Failed to construct signal";
 
 }  // namespace
@@ -38,18 +34,21 @@ TEST_F(ExtensionSyslogParserTest, ParseLog) {
   SyslogParser p;
   // Test shill log
   p.Parse(kShillLogEntry, &output, &filter_handler);
-  EXPECT_STREQ(output[0]->level.c_str(), "error");
-  EXPECT_STREQ(output[0]->process.c_str(), "shill:");
-  EXPECT_STREQ(output[0]->process_id.c_str(), "unknown");
-  EXPECT_STREQ(output[0]->full_entry.c_str(), kShillLogEntry);
-  EXPECT_EQ(output[0]->timestamp, 1373308092440.308);
+  ASSERT_EQ(1u, output.size());
+  EXPECT_STREQ("error", output[0]->level.c_str());
+  EXPECT_STREQ("shill:", output[0]->process.c_str());
+  EXPECT_STREQ("unknown", output[0]->process_id.c_str());
+  EXPECT_STREQ(kShillLogEntry, output[0]->full_entry.c_str());
+  EXPECT_DOUBLE_EQ(1373275692440.308, output[0]->timestamp);
+
   // Test WpaSupplicant log
   p.Parse(kWpaSupplicantLogEntry, &output, &filter_handler);
-  EXPECT_STREQ(output[1]->level.c_str(), "unknown");
-  EXPECT_STREQ(output[1]->process.c_str(), "wpa_supplicant");
-  EXPECT_STREQ(output[1]->process_id.c_str(), "894");
-  EXPECT_STREQ(output[1]->full_entry.c_str(), kWpaSupplicantLogEntry);
-  EXPECT_EQ(output[1]->timestamp, 1373312347443.1);
+  ASSERT_EQ(2u, output.size());
+  EXPECT_STREQ("unknown", output[1]->level.c_str());
+  EXPECT_STREQ("wpa_supplicant", output[1]->process.c_str());
+  EXPECT_STREQ("894", output[1]->process_id.c_str());
+  EXPECT_STREQ(kWpaSupplicantLogEntry, output[1]->full_entry.c_str());
+  EXPECT_DOUBLE_EQ(1374176347443.1, output[1]->timestamp);
 }
 
 }  // namespace extensions