diff options
Diffstat (limited to 'chrome/test/ui/ui_test.cc')
| -rw-r--r-- | chrome/test/ui/ui_test.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index a5f2566..ddea594 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -110,17 +110,13 @@ UITest::UITest() include_testing_id_(true), use_existing_browser_(default_use_existing_browser_), enable_file_cookies_(true), + test_start_time_(base::Time::NowFromSystemTime()), 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() { @@ -165,7 +161,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 = |