Fix the CountFilesCreatedAfter test.

base/file_util_unittest.cc

 // Copyright (c) 2012 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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
@@ skipping 321 matching lines @@
   {L"/foo/bar/", L"/foo/bar"},
   {L"/foo/bar//", L"/foo/bar"},
   {L"/foo/bar", L"/foo"},
   {L"/foo/bar./", L"/foo/bar."},
   {L"/", L"/"},
   {L".", L"."},
   {L"..", L"."},  // yes, ".." technically lives in "."
 #endif
 };
 
-// Flaky, http://crbug.com/46246
-TEST_F(FileUtilTest, DISABLED_CountFilesCreatedAfter) {
-  // Create old file (that we don't want to count)
-  FilePath old_file_name =
-      temp_dir_.path().Append(FILE_PATH_LITERAL("Old File.txt"));
-  CreateTextFile(old_file_name, L"Just call me Mr. Creakybits");
+TEST_F(FileUtilTest, CountFilesCreatedAfter) {
+  FilePath file_name =
+      temp_dir_.path().Append(FILE_PATH_LITERAL("f.txt"));
+  CreateTextFile(file_name, L"test");
 
-  // Age to perfection
-#if defined(OS_WIN)
-  base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(100));
-#elif defined(OS_POSIX)
-  // We need to wait at least one second here because the precision of
-  // file creation time is one second.
-  base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(1500));
-#endif
+  base::PlatformFileInfo info;
+  file_util::GetFileInfo(file_name, &info);
+  base::Time file_time = info.creation_time;
 
-  // Establish our cutoff time
-  base::Time now(base::Time::NowFromSystemTime());
-  EXPECT_EQ(0, file_util::CountFilesCreatedAfter(temp_dir_.path(), now));
+  base::TimeDelta two_secs = base::TimeDelta::FromSeconds(2);
+  base::Time after = file_time + two_secs;
+  EXPECT_EQ(0, file_util::CountFilesCreatedAfter(temp_dir_.path(), after));
 
-  // Create a new file (that we do want to count)
-  FilePath new_file_name =
-      temp_dir_.path().Append(FILE_PATH_LITERAL("New File.txt"));
-  CreateTextFile(new_file_name, L"Waaaaaaaaaaaaaah.");
+  base::Time before = file_time - two_secs;
+  EXPECT_EQ(1, file_util::CountFilesCreatedAfter(temp_dir_.path(), before));
 
-  // We should see only the new file.
-  EXPECT_EQ(1, file_util::CountFilesCreatedAfter(temp_dir_.path(), now));
-
-  // Delete new file, we should see no files after cutoff now
-  EXPECT_TRUE(file_util::Delete(new_file_name, false));
-  EXPECT_EQ(0, file_util::CountFilesCreatedAfter(temp_dir_.path(), now));
+  // After deleting the file, shouldn't find it any more.
+  EXPECT_TRUE(file_util::Delete(file_name, false));
+  EXPECT_EQ(0, file_util::CountFilesCreatedAfter(temp_dir_.path(), before));
+  EXPECT_EQ(0, file_util::CountFilesCreatedAfter(temp_dir_.path(), after));
 }
 
 TEST_F(FileUtilTest, FileAndDirectorySize) {
   // Create three files of 20, 30 and 3 chars (utf8). ComputeDirectorySize
   // should return 53 bytes.
   FilePath file_01 = temp_dir_.path().Append(FPL("The file 01.txt"));
   CreateTextFile(file_01, L"12345678901234567890");
   int64 size_f1 = 0;
   ASSERT_TRUE(file_util::GetFileSize(file_01, &size_f1));
   EXPECT_EQ(20ll, size_f1);
@@ skipping 1903 matching lines @@
       file_util::VerifyPathControlledByUser(
           base_dir_, text_file_, uid_, ok_gids_));
   EXPECT_TRUE(
       file_util::VerifyPathControlledByUser(
           sub_dir_, text_file_, uid_, ok_gids_));
 }
 
 #endif  // defined(OS_POSIX)
 
 }  // namespace