| 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/file_util.h" | 6 #include "base/file_util.h" |
| 7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
| 8 #include "base/process_util.h" | 8 #include "base/process_util.h" |
| 9 #include "base/test/test_timeouts.h" | 9 #include "base/test/test_timeouts.h" |
| 10 #include "chrome/common/chrome_notification_types.h" | 10 #include "chrome/common/chrome_notification_types.h" |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 int exit_code = -100; | 48 int exit_code = -100; |
| 49 bool exited = | 49 bool exited = |
| 50 base::WaitForExitCodeWithTimeout(handle, &exit_code, | 50 base::WaitForExitCodeWithTimeout(handle, &exit_code, |
| 51 TestTimeouts::action_timeout()); | 51 TestTimeouts::action_timeout()); |
| 52 | 52 |
| 53 EXPECT_TRUE(exited); | 53 EXPECT_TRUE(exited); |
| 54 EXPECT_EQ(chrome::RESULT_CODE_NORMAL_EXIT_PROCESS_NOTIFIED, exit_code); | 54 EXPECT_EQ(chrome::RESULT_CODE_NORMAL_EXIT_PROCESS_NOTIFIED, exit_code); |
| 55 base::CloseProcessHandle(handle); | 55 base::CloseProcessHandle(handle); |
| 56 } | 56 } |
| 57 | 57 |
| 58 IN_PROC_BROWSER_TEST_F(CloudPrintPolicyTest, CloudPrintPolicyFlag) { | 58 // Disabled due to http://crbug.com/144393. |
| 59 IN_PROC_BROWSER_TEST_F(CloudPrintPolicyTest, DISABLED_CloudPrintPolicyFlag) { |
| 59 CommandLine new_command_line(GetCommandLineForRelaunch()); | 60 CommandLine new_command_line(GetCommandLineForRelaunch()); |
| 60 new_command_line.AppendSwitch(switches::kCheckCloudPrintConnectorPolicy); | 61 new_command_line.AppendSwitch(switches::kCheckCloudPrintConnectorPolicy); |
| 61 // This is important for the test as the way the browser process is launched | 62 // This is important for the test as the way the browser process is launched |
| 62 // here causes the predictor databases to be initialized multiple times. This | 63 // here causes the predictor databases to be initialized multiple times. This |
| 63 // is not an issue for production where the process is launched as a service | 64 // is not an issue for production where the process is launched as a service |
| 64 // and a Profile is not created. See http://crbug.com/140466 for more details. | 65 // and a Profile is not created. See http://crbug.com/140466 for more details. |
| 65 new_command_line.AppendSwitchASCII( | 66 new_command_line.AppendSwitchASCII( |
| 66 switches::kSpeculativeResourcePrefetching, | 67 switches::kSpeculativeResourcePrefetching, |
| 67 switches::kSpeculativeResourcePrefetchingDisabled); | 68 switches::kSpeculativeResourcePrefetchingDisabled); |
| 68 | 69 |
| 69 base::ProcessHandle handle; | 70 base::ProcessHandle handle; |
| 70 bool launched = | 71 bool launched = |
| 71 base::LaunchProcess(new_command_line, base::LaunchOptions(), &handle); | 72 base::LaunchProcess(new_command_line, base::LaunchOptions(), &handle); |
| 72 EXPECT_TRUE(launched); | 73 EXPECT_TRUE(launched); |
| 73 | 74 |
| 74 int exit_code = -100; | 75 int exit_code = -100; |
| 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 |