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

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

Issue 6343002: Fix a dumb error in the chrome frame tests code which attempts to terminate a... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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) 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 <atlbase.h> 5 #include <atlbase.h>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/process_util.h" 8 #include "base/process_util.h"
9 #include "base/test/test_suite.h" 9 #include "base/test/test_suite.h"
10 #include "base/threading/platform_thread.h" 10 #include "base/threading/platform_thread.h"
(...skipping 29 matching lines...) Expand all
40 : base::TestSuite(argc, argv) {} 40 : base::TestSuite(argc, argv) {}
41 41
42 int Run() { 42 int Run() {
43 // Register a stack based exception handler to catch any exceptions which 43 // Register a stack based exception handler to catch any exceptions which
44 // occur in the course of the test. 44 // occur in the course of the test.
45 int ret = -1; 45 int ret = -1;
46 __try { 46 __try {
47 ret = base::TestSuite::Run(); 47 ret = base::TestSuite::Run();
48 } 48 }
49 49
50 _except(EXCEPTION_EXECUTE_HANDLER) { 50 __except(EXCEPTION_EXECUTE_HANDLER) {
51 ret = -1; 51 ret = -1;
52 } 52 }
53 return ret; 53 return ret;
54 } 54 }
55 }; 55 };
56 56
57 int main(int argc, char **argv) { 57 int main(int argc, char **argv) {
58 base::EnableTerminationOnHeapCorruption(); 58 base::EnableTerminationOnHeapCorruption();
59 base::PlatformThread::SetName("ChromeFrame tests"); 59 base::PlatformThread::SetName("ChromeFrame tests");
60 60
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 chrome_frame_test::KillProcesses(L"iexplore.exe", 0, false); 95 chrome_frame_test::KillProcesses(L"iexplore.exe", 0, false);
96 chrome_frame_test::KillProcesses(L"firefox.exe", 0, false); 96 chrome_frame_test::KillProcesses(L"firefox.exe", 0, false);
97 } 97 }
98 98
99 DeleteConfigValue(kChromeFrameHeadlessMode); 99 DeleteConfigValue(kChromeFrameHeadlessMode);
100 DeleteConfigValue(kChromeFrameAccessibleMode); 100 DeleteConfigValue(kChromeFrameAccessibleMode);
101 101
102 if (crash_service) 102 if (crash_service)
103 base::KillProcess(crash_service, 0, false); 103 base::KillProcess(crash_service, 0, false);
104 } 104 }
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