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 <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/kill.h" |
| 9 #include "base/process/memory.h" |
9 #include "base/test/test_suite.h" | 10 #include "base/test/test_suite.h" |
10 #include "base/threading/platform_thread.h" | 11 #include "base/threading/platform_thread.h" |
11 #include "base/win/scoped_com_initializer.h" | 12 #include "base/win/scoped_com_initializer.h" |
12 #include "chrome/common/chrome_paths.h" | 13 #include "chrome/common/chrome_paths.h" |
13 #include "chrome/common/metrics/entropy_provider.h" | 14 #include "chrome/common/metrics/entropy_provider.h" |
14 #include "chrome/test/logging/win/test_log_collector.h" | 15 #include "chrome/test/logging/win/test_log_collector.h" |
15 #include "chrome_frame/crash_server_init.h" | 16 #include "chrome_frame/crash_server_init.h" |
16 #include "chrome_frame/test/chrome_frame_test_utils.h" | 17 #include "chrome_frame/test/chrome_frame_test_utils.h" |
17 #include "chrome_frame/test/chrome_frame_ui_test_utils.h" | 18 #include "chrome_frame/test/chrome_frame_ui_test_utils.h" |
18 #include "chrome_frame/test/ie_configurator.h" | 19 #include "chrome_frame/test/ie_configurator.h" |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
100 ret = test_suite.Run(); | 101 ret = test_suite.Run(); |
101 } | 102 } |
102 | 103 |
103 DeleteConfigValue(kChromeFrameHeadlessMode); | 104 DeleteConfigValue(kChromeFrameHeadlessMode); |
104 DeleteConfigValue(kChromeFrameAccessibleMode); | 105 DeleteConfigValue(kChromeFrameAccessibleMode); |
105 | 106 |
106 if (crash_service) | 107 if (crash_service) |
107 base::KillProcess(crash_service, 0, false); | 108 base::KillProcess(crash_service, 0, false); |
108 return ret; | 109 return ret; |
109 } | 110 } |
OLD | NEW |