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

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

Issue 3432005: As a best effort terminate IE at the end of each chrome frame test run on an ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 3 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 | chrome_frame/test/ie_event_sink.cc » ('j') | 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 <atlbase.h> 7 #include <atlbase.h>
8 #include <atlwin.h> 8 #include <atlwin.h>
9 #include <iepmapi.h> 9 #include <iepmapi.h>
10 #include <sddl.h> 10 #include <sddl.h>
11 11
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/file_path.h" 13 #include "base/file_path.h"
14 #include "base/file_version_info.h" 14 #include "base/file_version_info.h"
15 #include "base/path_service.h" 15 #include "base/path_service.h"
16 #include "base/process_util.h" 16 #include "base/process_util.h"
17 #include "base/registry.h" // to find IE and firefox 17 #include "base/registry.h" // to find IE and firefox
18 #include "base/scoped_handle.h" 18 #include "base/scoped_handle.h"
19 #include "base/scoped_ptr.h" 19 #include "base/scoped_ptr.h"
20 #include "base/string_util.h" 20 #include "base/string_util.h"
21 #include "base/utf_string_conversions.h" 21 #include "base/utf_string_conversions.h"
22 #include "base/win_util.h" 22 #include "base/win_util.h"
23 #include "chrome/common/chrome_switches.h" 23 #include "chrome/common/chrome_switches.h"
24 #include "chrome/common/chrome_paths.h" 24 #include "chrome/common/chrome_paths.h"
25 #include "chrome/common/chrome_paths_internal.h" 25 #include "chrome/common/chrome_paths_internal.h"
26 #include "chrome_frame/utils.h" 26 #include "chrome_frame/utils.h"
27 27
28 namespace chrome_frame_test { 28 namespace chrome_frame_test {
29 29
30 const int kDefaultWaitForIEToTerminateMs = 10 * 1000;
31
32 const wchar_t kIEImageName[] = L"iexplore.exe"; 30 const wchar_t kIEImageName[] = L"iexplore.exe";
33 const wchar_t kIEBrokerImageName[] = L"ieuser.exe"; 31 const wchar_t kIEBrokerImageName[] = L"ieuser.exe";
34 const wchar_t kFirefoxImageName[] = L"firefox.exe"; 32 const wchar_t kFirefoxImageName[] = L"firefox.exe";
35 const wchar_t kOperaImageName[] = L"opera.exe"; 33 const wchar_t kOperaImageName[] = L"opera.exe";
36 const wchar_t kSafariImageName[] = L"safari.exe"; 34 const wchar_t kSafariImageName[] = L"safari.exe";
37 const char kChromeImageName[] = "chrome.exe"; 35 const char kChromeImageName[] = "chrome.exe";
38 const wchar_t kIEProfileName[] = L"iexplore"; 36 const wchar_t kIEProfileName[] = L"iexplore";
39 const wchar_t kChromeLauncher[] = L"chrome_launcher.exe"; 37 const wchar_t kChromeLauncher[] = L"chrome_launcher.exe";
40 const int kChromeFrameLongNavigationTimeoutInSeconds = 10; 38 const int kChromeFrameLongNavigationTimeoutInSeconds = 10;
41 39
(...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after
506 } 504 }
507 505
508 DLOG(INFO) << "Started crash_service.exe so you know if a test crashes!"; 506 DLOG(INFO) << "Started crash_service.exe so you know if a test crashes!";
509 // This sleep is to ensure that the crash service is done initializing, i.e 507 // This sleep is to ensure that the crash service is done initializing, i.e
510 // the pipe creation, etc. 508 // the pipe creation, etc.
511 Sleep(500); 509 Sleep(500);
512 return crash_service; 510 return crash_service;
513 } 511 }
514 512
515 } // namespace chrome_frame_test 513 } // namespace chrome_frame_test
OLDNEW
« no previous file with comments | « no previous file | chrome_frame/test/ie_event_sink.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698