diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 22:03:22 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 22:03:22 +0000 |
| commit | 136c39e7ed6e7e4176241272ef3dd17ec2f0fc96 (patch) | |
| tree | 91d806fe4af0e3122afc10eed5f592925d7c0a83 /chrome_frame/test/chrome_frame_test_utils.cc | |
| parent | 080f0a06fff3db65f4fe2e1549446f89bc23c7c1 (diff) | |
| download | chromium_src-136c39e7ed6e7e4176241272ef3dd17ec2f0fc96.zip chromium_src-136c39e7ed6e7e4176241272ef3dd17ec2f0fc96.tar.gz chromium_src-136c39e7ed6e7e4176241272ef3dd17ec2f0fc96.tar.bz2 | |
Enlarge the CF integration test timeout values, more so for Debug builds.
BUG=NONE
TEST=NONE
Review URL: http://codereview.chromium.org/9225051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119969 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/chrome_frame_test_utils.cc')
| -rw-r--r-- | chrome_frame/test/chrome_frame_test_utils.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc index 3324a0d..31d3e19 100644 --- a/chrome_frame/test/chrome_frame_test_utils.cc +++ b/chrome_frame/test/chrome_frame_test_utils.cc @@ -49,8 +49,14 @@ const wchar_t kIEBrokerImageName[] = L"ieuser.exe"; const char kChromeImageName[] = "chrome.exe"; const wchar_t kIEProfileName[] = L"iexplore"; const wchar_t kChromeLauncher[] = L"chrome_launcher.exe"; -const int kChromeFrameLongNavigationTimeoutInSeconds = 10; -const int kChromeFrameVeryLongNavigationTimeoutInSeconds = 30; + +#ifndef NDEBUG +const int kChromeFrameLongNavigationTimeoutInSeconds = 30; +const int kChromeFrameVeryLongNavigationTimeoutInSeconds = 90; +#else +const int kChromeFrameLongNavigationTimeoutInSeconds = 15; +const int kChromeFrameVeryLongNavigationTimeoutInSeconds = 45; +#endif // Callback function for EnumThreadWindows. BOOL CALLBACK CloseWindowsThreadCallback(HWND hwnd, LPARAM param) { |