Fix the "ls -l" style date parser to correctly guess the year if it is not provided.

net/ftp/ftp_directory_listing_buffer_unittest.cc

 // Copyright (c) 2009 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 "net/ftp/ftp_directory_listing_buffer.h"
 
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/path_service.h"
 #include "base/string_tokenizer.h"
@@ skipping 36 matching lines @@
     "dir-listing-windows-1",
     "dir-listing-windows-2",
   };
 
   FilePath test_dir;
   PathService::Get(base::DIR_SOURCE_ROOT, &test_dir);
   test_dir = test_dir.AppendASCII("net");
   test_dir = test_dir.AppendASCII("data");
   test_dir = test_dir.AppendASCII("ftp");
 
+  base::Time mock_current_time;
+  ASSERT_TRUE(base::Time::FromString(L"Tue, 15 Nov 1994 12:45:26 GMT",
+                                     &mock_current_time));
+
   for (size_t i = 0; i < arraysize(test_files); i++) {
     SCOPED_TRACE(StringPrintf("Test[%" PRIuS "]: %s", i, test_files[i]));
 
-    net::FtpDirectoryListingBuffer buffer;
+    net::FtpDirectoryListingBuffer buffer(mock_current_time);
 
     std::string test_listing;
     EXPECT_TRUE(file_util::ReadFileToString(test_dir.AppendASCII(test_files[i]),
                                             &test_listing));
 
     EXPECT_EQ(net::OK, buffer.ConsumeData(test_listing.data(),
                                           test_listing.length()));
     EXPECT_EQ(net::OK, buffer.ProcessRemainingData());
 
     std::string expected_listing;
     ASSERT_TRUE(file_util::ReadFileToString(
         test_dir.AppendASCII(std::string(test_files[i]) + ".expected"),
         &expected_listing));
 
     std::vector<std::string> lines;
     StringTokenizer tokenizer(expected_listing, "\r\n");
     while (tokenizer.GetNext())
       lines.push_back(tokenizer.token());
     ASSERT_EQ(0U, lines.size() % 8);
 
     for (size_t i = 0; i < lines.size() / 8; i++) {
       std::string type(lines[8 * i]);
       std::string name(lines[8 * i + 1]);
       int64 size = StringToInt64(lines[8 * i + 2]);
 
       SCOPED_TRACE(StringPrintf("Filename: %s", name.c_str()));
 
-      int year;
-      if (lines[8 * i + 3] == "current") {
-        base::Time::Exploded now_exploded;
-        base::Time::Now().LocalExplode(&now_exploded);
-        year = now_exploded.year;
-      } else {
-        year = StringToInt(lines[8 * i + 3]);
-      }
+      int year = StringToInt(lines[8 * i + 3]);
       int month = StringToInt(lines[8 * i + 4]);
       int day_of_month = StringToInt(lines[8 * i + 5]);
       int hour = StringToInt(lines[8 * i + 6]);
       int minute = StringToInt(lines[8 * i + 7]);
 
       ASSERT_TRUE(buffer.EntryAvailable());
       net::FtpDirectoryListingEntry entry = buffer.PopEntry();
 
       if (type == "d") {
         EXPECT_EQ(net::FtpDirectoryListingEntry::DIRECTORY, entry.type);
@@ skipping 16 matching lines @@
       EXPECT_EQ(hour, time_exploded.hour);
       EXPECT_EQ(minute, time_exploded.minute);
       EXPECT_EQ(0, time_exploded.second);
       EXPECT_EQ(0, time_exploded.millisecond);
     }
     EXPECT_FALSE(buffer.EntryAvailable());
   }
 }
 
 }  // namespace