| 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 "chrome/browser/chrome_notification_types.h" | 9 #include "chrome/browser/chrome_notification_types.h" |
| 10 #include "chrome/common/chrome_result_codes.h" | 10 #include "chrome/common/chrome_result_codes.h" |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 | 51 |
| 52 observer.Wait(); | 52 observer.Wait(); |
| 53 | 53 |
| 54 int exit_code = -100; | 54 int exit_code = -100; |
| 55 bool exited = process.WaitForExitWithTimeout(TestTimeouts::action_timeout(), | 55 bool exited = process.WaitForExitWithTimeout(TestTimeouts::action_timeout(), |
| 56 &exit_code); | 56 &exit_code); |
| 57 EXPECT_TRUE(exited); | 57 EXPECT_TRUE(exited); |
| 58 EXPECT_EQ(chrome::RESULT_CODE_NORMAL_EXIT_PROCESS_NOTIFIED, exit_code); | 58 EXPECT_EQ(chrome::RESULT_CODE_NORMAL_EXIT_PROCESS_NOTIFIED, exit_code); |
| 59 } | 59 } |
| 60 | 60 |
| 61 // Disabled due to http://crbug.com/144393. | |
| 62 IN_PROC_BROWSER_TEST_F(CloudPrintPolicyTest, DISABLED_CloudPrintPolicyFlag) { | |
| 63 base::CommandLine new_command_line(GetCommandLineForRelaunch()); | |
| 64 new_command_line.AppendSwitch(switches::kCheckCloudPrintConnectorPolicy); | |
| 65 // This is important for the test as the way the browser process is launched | |
| 66 // here causes the predictor databases to be initialized multiple times. This | |
| 67 // is not an issue for production where the process is launched as a service | |
| 68 // and a Profile is not created. See http://crbug.com/140466 for more details. | |
| 69 new_command_line.AppendSwitchASCII( | |
| 70 switches::kSpeculativeResourcePrefetching, | |
| 71 switches::kSpeculativeResourcePrefetchingDisabled); | |
| 72 | |
| 73 base::Process process = | |
| 74 base::LaunchProcess(new_command_line, base::LaunchOptionsForTest()); | |
| 75 EXPECT_TRUE(process.IsValid()); | |
| 76 | |
| 77 int exit_code = -100; | |
| 78 bool exited = process.WaitForExitWithTimeout(TestTimeouts::action_timeout(), | |
| 79 &exit_code); | |
| 80 EXPECT_TRUE(exited); | |
| 81 EXPECT_EQ(content::RESULT_CODE_NORMAL_EXIT, exit_code); | |
| 82 } | |
| 83 | |
| 84 } // namespace | 61 } // namespace |
| OLD | NEW |