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/process/kill.h" | 6 #include "base/process/kill.h" |
7 #include "base/process/launch.h" | 7 #include "base/process/launch.h" |
8 #include "base/test/test_timeouts.h" | 8 #include "base/test/test_timeouts.h" |
| 9 #include "build/build_config.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/test_switches.h" | 14 #include "chrome/test/base/test_switches.h" |
14 #include "chrome/test/base/ui_test_utils.h" | 15 #include "chrome/test/base/ui_test_utils.h" |
15 #include "content/public/browser/notification_service.h" | 16 #include "content/public/browser/notification_service.h" |
16 #include "content/public/common/result_codes.h" | 17 #include "content/public/common/result_codes.h" |
17 | 18 |
18 // These tests don't apply to the Mac version; see GetCommandLineForRelaunch | 19 // These tests don't apply to the Mac version; see GetCommandLineForRelaunch |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
52 observer.Wait(); | 53 observer.Wait(); |
53 | 54 |
54 int exit_code = -100; | 55 int exit_code = -100; |
55 bool exited = process.WaitForExitWithTimeout(TestTimeouts::action_timeout(), | 56 bool exited = process.WaitForExitWithTimeout(TestTimeouts::action_timeout(), |
56 &exit_code); | 57 &exit_code); |
57 EXPECT_TRUE(exited); | 58 EXPECT_TRUE(exited); |
58 EXPECT_EQ(chrome::RESULT_CODE_NORMAL_EXIT_PROCESS_NOTIFIED, exit_code); | 59 EXPECT_EQ(chrome::RESULT_CODE_NORMAL_EXIT_PROCESS_NOTIFIED, exit_code); |
59 } | 60 } |
60 | 61 |
61 } // namespace | 62 } // namespace |
OLD | NEW |