| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/env_var.h" | 5 #include "base/env_var.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/platform_thread.h" | 8 #include "base/platform_thread.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/sys_info.h" | 10 #include "base/sys_info.h" |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 TEST_F(ShutdownTest, SimpleUserQuit) { | 102 TEST_F(ShutdownTest, SimpleUserQuit) { |
| 103 RunShutdownTest("shutdown", "simple-user-quit", | 103 RunShutdownTest("shutdown", "simple-user-quit", |
| 104 true, /* important */ UITest::USER_QUIT); | 104 true, /* important */ UITest::USER_QUIT); |
| 105 } | 105 } |
| 106 | 106 |
| 107 TEST_F(ShutdownTest, SimpleSessionEnding) { | 107 TEST_F(ShutdownTest, SimpleSessionEnding) { |
| 108 RunShutdownTest("shutdown", "simple-session-ending", | 108 RunShutdownTest("shutdown", "simple-session-ending", |
| 109 true, /* important */ UITest::SESSION_ENDING); | 109 true, /* important */ UITest::SESSION_ENDING); |
| 110 } | 110 } |
| 111 | 111 |
| 112 TEST_F(ShutdownTest, TwentyTabsWindowClose) { | 112 // http://crbug.com/46609 |
| 113 #if defined(OS_MACOSX) |
| 114 #define MAYBE_TwentyTabsWindowClose FLAKY_TwentyTabsWindowClose |
| 115 #define MAYBE_TwentyTabsUserQuit FLAKY_TwentyTabsUserQuit |
| 116 #else |
| 117 #define MAYBE_TwentyTabsWindowClose TwentyTabsWindowClose |
| 118 #define MAYBE_TwentyTabsUserQuit TwentyTabsUserQuit |
| 119 #endif |
| 120 |
| 121 TEST_F(ShutdownTest, MAYBE_TwentyTabsWindowClose) { |
| 113 SetUpTwentyTabs(); | 122 SetUpTwentyTabs(); |
| 114 RunShutdownTest("shutdown", "twentytabs-window-close", | 123 RunShutdownTest("shutdown", "twentytabs-window-close", |
| 115 true, /* important */ UITest::WINDOW_CLOSE); | 124 true, /* important */ UITest::WINDOW_CLOSE); |
| 116 } | 125 } |
| 117 | 126 |
| 118 TEST_F(ShutdownTest, TwentyTabsUserQuit) { | 127 TEST_F(ShutdownTest, MAYBE_TwentyTabsUserQuit) { |
| 119 SetUpTwentyTabs(); | 128 SetUpTwentyTabs(); |
| 120 RunShutdownTest("shutdown", "twentytabs-user-quit", | 129 RunShutdownTest("shutdown", "twentytabs-user-quit", |
| 121 true, /* important */ UITest::USER_QUIT); | 130 true, /* important */ UITest::USER_QUIT); |
| 122 } | 131 } |
| 123 | 132 |
| 124 // http://crbug.com/40671 | 133 // http://crbug.com/40671 |
| 125 #if defined(OS_WIN) && !defined(NDEBUG) | 134 #if defined(OS_WIN) && !defined(NDEBUG) |
| 126 #define MAYBE_TwentyTabsSessionEnding DISABLED_TwentyTabsSessionEnding | 135 #define MAYBE_TwentyTabsSessionEnding DISABLED_TwentyTabsSessionEnding |
| 136 #elif defined(OS_MACOSX) |
| 137 // http://crbug.com/46609 |
| 138 #define MAYBE_TwentyTabsSessionEnding FLAKY_TwentyTabsSessionEnding |
| 127 #else | 139 #else |
| 128 #define MAYBE_TwentyTabsSessionEnding TwentyTabsSessionEnding | 140 #define MAYBE_TwentyTabsSessionEnding TwentyTabsSessionEnding |
| 129 #endif | 141 #endif |
| 142 |
| 130 TEST_F(ShutdownTest, MAYBE_TwentyTabsSessionEnding) { | 143 TEST_F(ShutdownTest, MAYBE_TwentyTabsSessionEnding) { |
| 131 SetUpTwentyTabs(); | 144 SetUpTwentyTabs(); |
| 132 RunShutdownTest("shutdown", "twentytabs-session-ending", | 145 RunShutdownTest("shutdown", "twentytabs-session-ending", |
| 133 true, /* important */ UITest::SESSION_ENDING); | 146 true, /* important */ UITest::SESSION_ENDING); |
| 134 } | 147 } |
| 135 | 148 |
| 136 } // namespace | 149 } // namespace |
| OLD | NEW |