| 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 // These tests don't apply to the Mac version; see GetCommandLineForRelaunch | 18 // These tests don't apply to the Mac version; see GetCommandLineForRelaunch |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 bool exited = | 76 bool exited = |
| 76 base::WaitForExitCodeWithTimeout(handle, &exit_code, | 77 base::WaitForExitCodeWithTimeout(handle, &exit_code, |
| 77 TestTimeouts::action_timeout()); | 78 TestTimeouts::action_timeout()); |
| 78 | 79 |
| 79 EXPECT_TRUE(exited); | 80 EXPECT_TRUE(exited); |
| 80 EXPECT_EQ(content::RESULT_CODE_NORMAL_EXIT, exit_code); | 81 EXPECT_EQ(content::RESULT_CODE_NORMAL_EXIT, exit_code); |
| 81 base::CloseProcessHandle(handle); | 82 base::CloseProcessHandle(handle); |
| 82 } | 83 } |
| 83 | 84 |
| 84 } // namespace | 85 } // namespace |
| OLD | NEW |