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 "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
7 #include "base/process_util.h" | 7 #include "base/process/kill.h" |
| 8 #include "base/process/launch.h" |
8 #include "base/test/test_timeouts.h" | 9 #include "base/test/test_timeouts.h" |
9 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
10 #include "chrome/common/chrome_result_codes.h" | 11 #include "chrome/common/chrome_result_codes.h" |
11 #include "chrome/common/chrome_switches.h" | 12 #include "chrome/common/chrome_switches.h" |
12 #include "chrome/test/base/in_process_browser_test.h" | 13 #include "chrome/test/base/in_process_browser_test.h" |
13 #include "chrome/test/base/ui_test_utils.h" | 14 #include "chrome/test/base/ui_test_utils.h" |
14 #include "content/public/browser/notification_service.h" | 15 #include "content/public/browser/notification_service.h" |
15 #include "content/public/common/result_codes.h" | 16 #include "content/public/common/result_codes.h" |
16 | 17 |
17 #if defined(OS_WIN) && defined(USE_ASH) | 18 #if defined(OS_WIN) && defined(USE_ASH) |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
85 bool exited = | 86 bool exited = |
86 base::WaitForExitCodeWithTimeout(handle, &exit_code, | 87 base::WaitForExitCodeWithTimeout(handle, &exit_code, |
87 TestTimeouts::action_timeout()); | 88 TestTimeouts::action_timeout()); |
88 | 89 |
89 EXPECT_TRUE(exited); | 90 EXPECT_TRUE(exited); |
90 EXPECT_EQ(content::RESULT_CODE_NORMAL_EXIT, exit_code); | 91 EXPECT_EQ(content::RESULT_CODE_NORMAL_EXIT, exit_code); |
91 base::CloseProcessHandle(handle); | 92 base::CloseProcessHandle(handle); |
92 } | 93 } |
93 | 94 |
94 } // namespace | 95 } // namespace |
OLD | NEW |