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

Unified Diff: chrome_frame/test/chrome_frame_test_utils.cc

Issue 12220101: Minimal Chrome Frame with Aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert install_worker.cc to un-break win64 build Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/automation/tab_proxy.cc ('k') | content/common/content_message_generator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/chrome_frame_test_utils.cc
diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc
index ac52ea7033337c79f8493989451b9239ccae32d7..665656a2154fb42d3c069f5d40fe516c646ed1cc 100644
--- a/chrome_frame/test/chrome_frame_test_utils.cc
+++ b/chrome_frame/test/chrome_frame_test_utils.cc
@@ -46,7 +46,8 @@ const DWORD kCrashServicePipeDesiredAccess = FILE_READ_DATA |
const DWORD kCrashServicePipeFlagsAndAttributes = SECURITY_IDENTIFICATION |
SECURITY_SQOS_PRESENT;
-const int kCrashServiceStartupTimeoutMs = 500;
+const int kCrashServiceDetectTimeoutMs = 500;
+const int kCrashServiceStartupTimeoutMs = 1000;
const wchar_t kIEImageName[] = L"iexplore.exe";
const wchar_t kIEBrokerImageName[] = L"ieuser.exe";
@@ -596,7 +597,7 @@ bool DetectRunningCrashService(int timeout_ms) {
}
base::ProcessHandle StartCrashService() {
- if (DetectRunningCrashService(kCrashServiceStartupTimeoutMs)) {
+ if (DetectRunningCrashService(kCrashServiceDetectTimeoutMs)) {
VLOG(1) << "crash_service.exe is already running. We will use the "
"existing process and leave it running after tests complete.";
return NULL;
« no previous file with comments | « chrome/test/automation/tab_proxy.cc ('k') | content/common/content_message_generator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698