OLD | NEW |
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 28 matching lines...) Expand all Loading... |
39 namespace chrome_frame_test { | 39 namespace chrome_frame_test { |
40 | 40 |
41 const wchar_t kCrashServicePipeName[] = L"\\\\.\\pipe\\ChromeCrashServices"; | 41 const wchar_t kCrashServicePipeName[] = L"\\\\.\\pipe\\ChromeCrashServices"; |
42 | 42 |
43 const DWORD kCrashServicePipeDesiredAccess = FILE_READ_DATA | | 43 const DWORD kCrashServicePipeDesiredAccess = FILE_READ_DATA | |
44 FILE_WRITE_DATA | | 44 FILE_WRITE_DATA | |
45 FILE_WRITE_ATTRIBUTES; | 45 FILE_WRITE_ATTRIBUTES; |
46 | 46 |
47 const DWORD kCrashServicePipeFlagsAndAttributes = SECURITY_IDENTIFICATION | | 47 const DWORD kCrashServicePipeFlagsAndAttributes = SECURITY_IDENTIFICATION | |
48 SECURITY_SQOS_PRESENT; | 48 SECURITY_SQOS_PRESENT; |
49 const int kCrashServiceStartupTimeoutMs = 500; | 49 const int kCrashServiceDetectTimeoutMs = 500; |
| 50 const int kCrashServiceStartupTimeoutMs = 1000; |
50 | 51 |
51 const wchar_t kIEImageName[] = L"iexplore.exe"; | 52 const wchar_t kIEImageName[] = L"iexplore.exe"; |
52 const wchar_t kIEBrokerImageName[] = L"ieuser.exe"; | 53 const wchar_t kIEBrokerImageName[] = L"ieuser.exe"; |
53 const char kChromeImageName[] = "chrome.exe"; | 54 const char kChromeImageName[] = "chrome.exe"; |
54 const wchar_t kIEProfileName[] = L"iexplore"; | 55 const wchar_t kIEProfileName[] = L"iexplore"; |
55 const wchar_t kChromeLauncher[] = L"chrome_launcher.exe"; | 56 const wchar_t kChromeLauncher[] = L"chrome_launcher.exe"; |
56 | 57 |
57 #ifndef NDEBUG | 58 #ifndef NDEBUG |
58 const base::TimeDelta kChromeFrameLongNavigationTimeout = | 59 const base::TimeDelta kChromeFrameLongNavigationTimeout = |
59 base::TimeDelta::FromSeconds(30); | 60 base::TimeDelta::FromSeconds(30); |
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
589 if (duration.InMilliseconds() > timeout_ms) { | 590 if (duration.InMilliseconds() > timeout_ms) { |
590 return false; | 591 return false; |
591 } | 592 } |
592 } | 593 } |
593 | 594 |
594 Sleep(10); | 595 Sleep(10); |
595 } | 596 } |
596 } | 597 } |
597 | 598 |
598 base::ProcessHandle StartCrashService() { | 599 base::ProcessHandle StartCrashService() { |
599 if (DetectRunningCrashService(kCrashServiceStartupTimeoutMs)) { | 600 if (DetectRunningCrashService(kCrashServiceDetectTimeoutMs)) { |
600 VLOG(1) << "crash_service.exe is already running. We will use the " | 601 VLOG(1) << "crash_service.exe is already running. We will use the " |
601 "existing process and leave it running after tests complete."; | 602 "existing process and leave it running after tests complete."; |
602 return NULL; | 603 return NULL; |
603 } | 604 } |
604 | 605 |
605 base::FilePath exe_dir; | 606 base::FilePath exe_dir; |
606 if (!PathService::Get(base::DIR_EXE, &exe_dir)) { | 607 if (!PathService::Get(base::DIR_EXE, &exe_dir)) { |
607 DCHECK(false); | 608 DCHECK(false); |
608 return NULL; | 609 return NULL; |
609 } | 610 } |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
708 if (address.empty()) { | 709 if (address.empty()) { |
709 LOG(ERROR) << "Failed to find a non-loopback IP_V4 address. Tests will be " | 710 LOG(ERROR) << "Failed to find a non-loopback IP_V4 address. Tests will be " |
710 << "run over the loopback adapter, which may result in hangs."; | 711 << "run over the loopback adapter, which may result in hangs."; |
711 address.assign("127.0.0.1"); | 712 address.assign("127.0.0.1"); |
712 } | 713 } |
713 | 714 |
714 return address; | 715 return address; |
715 } | 716 } |
716 | 717 |
717 } // namespace chrome_frame_test | 718 } // namespace chrome_frame_test |
OLD | NEW |