diff options
| author | erikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-15 16:39:17 +0000 |
|---|---|---|
| committer | erikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-15 16:39:17 +0000 |
| commit | a4cbaa5de0dc12cfbbe5e9a4ddccd8d24329a995 (patch) | |
| tree | 02b41210767c574660a844d9bc772ff43dc4cf9e /chrome/test/ui | |
| parent | 74eb4ceef0aee9d59839816800016a150a8e446f (diff) | |
| download | chromium_src-a4cbaa5de0dc12cfbbe5e9a4ddccd8d24329a995.zip chromium_src-a4cbaa5de0dc12cfbbe5e9a4ddccd8d24329a995.tar.gz chromium_src-a4cbaa5de0dc12cfbbe5e9a4ddccd8d24329a995.tar.bz2 | |
Submitting http://codereview.chromium.org/73075 on behalf of shinichiro.hamaji@gmail.com
Review URL: http://codereview.chromium.org/73083
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13748 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui')
| -rw-r--r-- | chrome/test/ui/ui_test.cc | 8 | ||||
| -rw-r--r-- | chrome/test/ui/ui_test.h | 7 |
2 files changed, 3 insertions, 12 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index f0f29aa..ad74976 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -113,17 +113,13 @@ 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() { @@ -168,7 +164,7 @@ void UITest::TearDown() { #if defined(OS_WIN) // Check for crashes during the test - std::wstring crash_dump_path; + FilePath 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 75ecae2..031e3c5 100644 --- a/chrome/test/ui/ui_test.h +++ b/chrome/test/ui/ui_test.h @@ -446,13 +446,8 @@ class UITest : public testing::Test { bool enable_file_cookies_; // Enable file cookies, default is true. private: -#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 + base::Time 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 |