Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(382)

Side by Side Diff: chrome_frame/test/chrome_frame_test_utils.cc

Issue 9225051: Enlarge the CF integration test timeout values, more so for Debug builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Correct inverted Release/Debug values. Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome_frame/test/chrome_frame_test_utils.h" 5 #include "chrome_frame/test/chrome_frame_test_utils.h"
6 6
7 #include <atlapp.h> 7 #include <atlapp.h>
8 #include <atlmisc.h> 8 #include <atlmisc.h>
9 #include <iepmapi.h> 9 #include <iepmapi.h>
10 #include <sddl.h> 10 #include <sddl.h>
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 42
43 const DWORD kCrashServicePipeFlagsAndAttributes = SECURITY_IDENTIFICATION | 43 const DWORD kCrashServicePipeFlagsAndAttributes = SECURITY_IDENTIFICATION |
44 SECURITY_SQOS_PRESENT; 44 SECURITY_SQOS_PRESENT;
45 const int kCrashServiceStartupTimeoutMs = 500; 45 const int kCrashServiceStartupTimeoutMs = 500;
46 46
47 const wchar_t kIEImageName[] = L"iexplore.exe"; 47 const wchar_t kIEImageName[] = L"iexplore.exe";
48 const wchar_t kIEBrokerImageName[] = L"ieuser.exe"; 48 const wchar_t kIEBrokerImageName[] = L"ieuser.exe";
49 const char kChromeImageName[] = "chrome.exe"; 49 const char kChromeImageName[] = "chrome.exe";
50 const wchar_t kIEProfileName[] = L"iexplore"; 50 const wchar_t kIEProfileName[] = L"iexplore";
51 const wchar_t kChromeLauncher[] = L"chrome_launcher.exe"; 51 const wchar_t kChromeLauncher[] = L"chrome_launcher.exe";
52 const int kChromeFrameLongNavigationTimeoutInSeconds = 10; 52
53 const int kChromeFrameVeryLongNavigationTimeoutInSeconds = 30; 53 #ifndef NDEBUG
54 const int kChromeFrameLongNavigationTimeoutInSeconds = 30;
55 const int kChromeFrameVeryLongNavigationTimeoutInSeconds = 90;
56 #else
57 const int kChromeFrameLongNavigationTimeoutInSeconds = 15;
58 const int kChromeFrameVeryLongNavigationTimeoutInSeconds = 45;
59 #endif
54 60
55 // Callback function for EnumThreadWindows. 61 // Callback function for EnumThreadWindows.
56 BOOL CALLBACK CloseWindowsThreadCallback(HWND hwnd, LPARAM param) { 62 BOOL CALLBACK CloseWindowsThreadCallback(HWND hwnd, LPARAM param) {
57 int& count = *reinterpret_cast<int*>(param); 63 int& count = *reinterpret_cast<int*>(param);
58 if (IsWindowVisible(hwnd)) { 64 if (IsWindowVisible(hwnd)) {
59 if (IsWindowEnabled(hwnd)) { 65 if (IsWindowEnabled(hwnd)) {
60 DWORD results = 0; 66 DWORD results = 0;
61 if (!::SendMessageTimeout(hwnd, WM_SYSCOMMAND, SC_CLOSE, 0, SMTO_BLOCK, 67 if (!::SendMessageTimeout(hwnd, WM_SYSCOMMAND, SC_CLOSE, 0, SMTO_BLOCK,
62 10000, &results)) { 68 10000, &results)) {
63 LOG(WARNING) << "Window hung: " << base::StringPrintf(L"%08X", hwnd); 69 LOG(WARNING) << "Window hung: " << base::StringPrintf(L"%08X", hwnd);
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after
657 wchar_t local_app_data_path[MAX_PATH + 1] = {0}; 663 wchar_t local_app_data_path[MAX_PATH + 1] = {0};
658 SHGetFolderPath(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, 664 SHGetFolderPath(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT,
659 local_app_data_path); 665 local_app_data_path);
660 666
661 std::wstring session_history_path = local_app_data_path; 667 std::wstring session_history_path = local_app_data_path;
662 session_history_path += L"\\Microsoft\\Internet Explorer\\Recovery"; 668 session_history_path += L"\\Microsoft\\Internet Explorer\\Recovery";
663 file_util::Delete(session_history_path, true); 669 file_util::Delete(session_history_path, true);
664 } 670 }
665 671
666 } // namespace chrome_frame_test 672 } // namespace chrome_frame_test
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698