summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/file_util.h11
-rw-r--r--base/file_util_unittest.cc17
-rw-r--r--base/file_util_win.cc11
-rw-r--r--chrome/test/automated_ui_tests/automated_ui_tests.cc7
-rw-r--r--chrome/test/automated_ui_tests/automated_ui_tests.h6
-rw-r--r--chrome/test/ui/ui_test.cc8
-rw-r--r--chrome/test/ui/ui_test.h7
7 files changed, 34 insertions, 33 deletions
diff --git a/base/file_util.h b/base/file_util.h
index 20d98b0..6c916dd 100644
--- a/base/file_util.h
+++ b/base/file_util.h
@@ -27,10 +27,6 @@
#include "base/scoped_ptr.h"
#include "base/file_path.h"
-namespace base {
-class Time;
-}
-
namespace file_util {
//-----------------------------------------------------------------------------
@@ -139,9 +135,10 @@ void ReplaceIllegalCharacters(std::wstring* file_name, int replace_char);
#if defined(OS_WIN)
// Returns the number of files matching the current path that were
-// created on or after the given |file_time|. Doesn't count ".." or ".".
-int CountFilesCreatedAfter(const FilePath& path,
- const base::Time& file_time);
+// created on or after the given FILETIME. Doesn't count ".." or ".".
+// Filetime is UTC filetime, not LocalFiletime.
+int CountFilesCreatedAfter(const std::wstring& path,
+ const FILETIME& file_time);
#endif // defined(OS_WIN)
// Deletes the given path, whether it's a file or a directory.
diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc
index df30817..7f24fc5 100644
--- a/base/file_util_unittest.cc
+++ b/base/file_util_unittest.cc
@@ -20,7 +20,6 @@
#include "base/logging.h"
#include "base/path_service.h"
#include "base/string_util.h"
-#include "base/time.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"
@@ -317,26 +316,30 @@ TEST_F(FileUtilTest, GetDirectoryFromPath) {
#if defined OS_WIN
TEST_F(FileUtilTest, CountFilesCreatedAfter) {
// Create old file (that we don't want to count)
- FilePath old_file_name = test_dir_.Append(FILE_PATH_LITERAL("Old File.txt"));
+ FilePath old_file_name = test_dir_.Append(L"Old File.txt");
CreateTextFile(old_file_name, L"Just call me Mr. Creakybits");
// Age to perfection
Sleep(100);
// Establish our cutoff time
- base::Time now(base::Time::Now());
- EXPECT_EQ(0, file_util::CountFilesCreatedAfter(test_dir_, now));
+ FILETIME test_start_time;
+ GetSystemTimeAsFileTime(&test_start_time);
+ EXPECT_EQ(0, file_util::CountFilesCreatedAfter(test_dir_.value(),
+ test_start_time));
// Create a new file (that we do want to count)
- FilePath new_file_name = test_dir_.Append(FILE_PATH_LITERAL("New File.txt"));
+ FilePath new_file_name = test_dir_.Append(L"New File.txt");
CreateTextFile(new_file_name, L"Waaaaaaaaaaaaaah.");
// We should see only the new file.
- EXPECT_EQ(1, file_util::CountFilesCreatedAfter(test_dir_, now));
+ EXPECT_EQ(1, file_util::CountFilesCreatedAfter(test_dir_.value(),
+ test_start_time));
// 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(test_dir_, now));
+ EXPECT_EQ(0, file_util::CountFilesCreatedAfter(test_dir_.value(),
+ test_start_time));
}
#endif
diff --git a/base/file_util_win.cc b/base/file_util_win.cc
index 8b3d4f5..841cd28 100644
--- a/base/file_util_win.cc
+++ b/base/file_util_win.cc
@@ -14,7 +14,6 @@
#include "base/logging.h"
#include "base/scoped_handle.h"
#include "base/string_util.h"
-#include "base/time.h"
#include "base/win_util.h"
namespace file_util {
@@ -40,14 +39,12 @@ bool AbsolutePath(FilePath* path) {
return true;
}
-int CountFilesCreatedAfter(const FilePath& path,
- const base::Time& comparison_time) {
+int CountFilesCreatedAfter(const std::wstring& path,
+ const FILETIME& comparison_time) {
int file_count = 0;
- FILETIME comparison_filetime(comparison_time.ToFileTime());
WIN32_FIND_DATA find_file_data;
- // All files in given dir
- std::wstring filename_spec = path.Append(L"*").value();
+ std::wstring filename_spec = path + L"\\*"; // All files in given dir
HANDLE find_handle = FindFirstFile(filename_spec.c_str(), &find_file_data);
if (find_handle != INVALID_HANDLE_VALUE) {
do {
@@ -57,7 +54,7 @@ int CountFilesCreatedAfter(const FilePath& path,
continue;
long result = CompareFileTime(&find_file_data.ftCreationTime,
- &comparison_filetime);
+ &comparison_time);
// File was created after or on comparison time
if ((result == 1) || (result == 0))
++file_count;
diff --git a/chrome/test/automated_ui_tests/automated_ui_tests.cc b/chrome/test/automated_ui_tests/automated_ui_tests.cc
index 9b0eb77..7c17706 100644
--- a/chrome/test/automated_ui_tests/automated_ui_tests.cc
+++ b/chrome/test/automated_ui_tests/automated_ui_tests.cc
@@ -11,7 +11,6 @@
#include "base/rand_util.h"
#include "base/string_util.h"
#include "base/sys_info.h"
-#include "base/time.h"
#include "chrome/app/chrome_dll_resource.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/character_encoding.h"
@@ -82,11 +81,11 @@ const std::string kDialogs[] = {
};
AutomatedUITest::AutomatedUITest()
- : test_start_time_(base::Time::Now()),
- total_crashes_(0),
+ : total_crashes_(0),
debug_logging_enabled_(false),
post_action_delay_(0) {
show_window_ = true;
+ GetSystemTimeAsFileTime(&test_start_time_);
const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
if (parsed_command_line.HasSwitch(kDebugModeSwitch))
debug_logging_enabled_ = true;
@@ -942,7 +941,7 @@ std::wstring AutomatedUITest::GetMostRecentCrashDump() {
}
bool AutomatedUITest::DidCrash(bool update_total_crashes) {
- FilePath crash_dump_path;
+ std::wstring crash_dump_path;
PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dump_path);
// Each crash creates two dump files, so we divide by two here.
int actual_crashes = file_util::CountFilesCreatedAfter(
diff --git a/chrome/test/automated_ui_tests/automated_ui_tests.h b/chrome/test/automated_ui_tests/automated_ui_tests.h
index 754b598..fc557cf 100644
--- a/chrome/test/automated_ui_tests/automated_ui_tests.h
+++ b/chrome/test/automated_ui_tests/automated_ui_tests.h
@@ -104,10 +104,6 @@
#include "chrome/test/automated_ui_tests/automated_ui_test_base.h"
#include "chrome/test/ui/ui_test.h"
-namespace base {
-class Time;
-}
-
class AutomatedUITest : public AutomatedUITestBase {
protected:
AutomatedUITest();
@@ -460,7 +456,7 @@ class AutomatedUITest : public AutomatedUITestBase {
XmlWriter xml_writer_;
// Time the test was started. Used to find crash dumps.
- base::Time test_start_time_;
+ FILETIME test_start_time_;
// Number of times the browser has crashed during this run.
// Used to check for new crashes.
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index ad74976..f0f29aa 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -113,13 +113,17 @@ UITest::UITest()
include_testing_id_(true),
use_existing_browser_(default_use_existing_browser_),
enable_file_cookies_(true),
- test_start_time_(base::Time::Now()),
command_execution_timeout_ms_(kMaxTestExecutionTime),
action_timeout_ms_(kWaitForActionMsec),
action_max_timeout_ms_(kWaitForActionMaxMsec),
sleep_timeout_ms_(kWaitForActionMsec) {
PathService::Get(chrome::DIR_APP, &browser_directory_);
PathService::Get(chrome::DIR_TEST_DATA, &test_data_directory_);
+#if defined(OS_WIN)
+ GetSystemTimeAsFileTime(&test_start_time_);
+#else
+ // http://code.google.com/p/chromium/issues/detail?id=9833
+#endif
}
void UITest::SetUp() {
@@ -164,7 +168,7 @@ void UITest::TearDown() {
#if defined(OS_WIN)
// Check for crashes during the test
- FilePath crash_dump_path;
+ std::wstring crash_dump_path;
PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dump_path);
// Each crash creates two dump files, so we divide by two here.
int actual_crashes =
diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h
index 031e3c5..75ecae2 100644
--- a/chrome/test/ui/ui_test.h
+++ b/chrome/test/ui/ui_test.h
@@ -446,8 +446,13 @@ class UITest : public testing::Test {
bool enable_file_cookies_; // Enable file cookies, default is true.
private:
- base::Time test_start_time_; // Time the test was started
+#if defined(OS_WIN)
+ // TODO(port): make this use base::Time instead. It would seem easy, but
+ // the code also depends on file_util::CountFilesCreatedAfter which hasn't
+ // yet been made portable.
+ FILETIME test_start_time_; // Time the test was started
// (so we can check for new crash dumps)
+#endif
static bool no_sandbox_;
static bool safe_plugins_;
static bool full_memory_dump_; // If true, write full memory dump
generated by cgit v1.1 at 2024-10-29 13:44:18 +0000