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/environment.h" | 5 #include "base/environment.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_number_conversions.h" | 9 #include "base/string_number_conversions.h" |
10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
116 TEST_F(ShutdownTest, SimpleWindowClose) { | 116 TEST_F(ShutdownTest, SimpleWindowClose) { |
117 RunShutdownTest("shutdown", "simple-window-close", | 117 RunShutdownTest("shutdown", "simple-window-close", |
118 true, /* important */ SIMPLE, UITest::WINDOW_CLOSE); | 118 true, /* important */ SIMPLE, UITest::WINDOW_CLOSE); |
119 } | 119 } |
120 | 120 |
121 TEST_F(ShutdownTest, SimpleUserQuit) { | 121 TEST_F(ShutdownTest, SimpleUserQuit) { |
122 RunShutdownTest("shutdown", "simple-user-quit", | 122 RunShutdownTest("shutdown", "simple-user-quit", |
123 true, /* important */ SIMPLE, UITest::USER_QUIT); | 123 true, /* important */ SIMPLE, UITest::USER_QUIT); |
124 } | 124 } |
125 | 125 |
126 TEST_F(ShutdownTest, SimpleSessionEnding) { | 126 // http://crbug.com/52858 |
| 127 #if defined(OS_MACOSX) |
| 128 #define MAYBE_SimpleSessionEnding FLAKY_SimpleSessionEnding |
| 129 #define MAYBE_TwentyTabsUserQuit FLAKY_TwentyTabsUserQuit |
| 130 #else |
| 131 #define MAYBE_SimpleSessionEnding SimpleSessionEnding |
| 132 #define MAYBE_TwentyTabsUserQuit TwentyTabsUserQuit |
| 133 #endif |
| 134 |
| 135 TEST_F(ShutdownTest, MAYBE_SimpleSessionEnding) { |
127 RunShutdownTest("shutdown", "simple-session-ending", | 136 RunShutdownTest("shutdown", "simple-session-ending", |
128 true, /* important */ SIMPLE, UITest::SESSION_ENDING); | 137 true, /* important */ SIMPLE, UITest::SESSION_ENDING); |
129 } | 138 } |
130 | 139 |
131 TEST_F(ShutdownTest, TwentyTabsWindowClose) { | 140 TEST_F(ShutdownTest, TwentyTabsWindowClose) { |
132 RunShutdownTest("shutdown", "twentytabs-window-close", | 141 RunShutdownTest("shutdown", "twentytabs-window-close", |
133 true, /* important */ TWENTY_TABS, UITest::WINDOW_CLOSE); | 142 true, /* important */ TWENTY_TABS, UITest::WINDOW_CLOSE); |
134 } | 143 } |
135 | 144 |
136 TEST_F(ShutdownTest, TwentyTabsUserQuit) { | 145 TEST_F(ShutdownTest, MAYBE_TwentyTabsUserQuit) { |
137 RunShutdownTest("shutdown", "twentytabs-user-quit", | 146 RunShutdownTest("shutdown", "twentytabs-user-quit", |
138 true, /* important */ TWENTY_TABS, UITest::USER_QUIT); | 147 true, /* important */ TWENTY_TABS, UITest::USER_QUIT); |
139 } | 148 } |
140 | 149 |
141 // http://crbug.com/40671 | 150 // http://crbug.com/40671 |
142 #if defined(OS_WIN) && !defined(NDEBUG) | 151 #if defined(OS_WIN) && !defined(NDEBUG) |
143 #define MAYBE_TwentyTabsSessionEnding DISABLED_TwentyTabsSessionEnding | 152 #define MAYBE_TwentyTabsSessionEnding DISABLED_TwentyTabsSessionEnding |
144 #else | 153 #else |
145 #define MAYBE_TwentyTabsSessionEnding TwentyTabsSessionEnding | 154 #define MAYBE_TwentyTabsSessionEnding TwentyTabsSessionEnding |
146 #endif | 155 #endif |
147 | 156 |
148 TEST_F(ShutdownTest, MAYBE_TwentyTabsSessionEnding) { | 157 TEST_F(ShutdownTest, MAYBE_TwentyTabsSessionEnding) { |
149 RunShutdownTest("shutdown", "twentytabs-session-ending", | 158 RunShutdownTest("shutdown", "twentytabs-session-ending", |
150 true, /* important */ TWENTY_TABS, UITest::SESSION_ENDING); | 159 true, /* important */ TWENTY_TABS, UITest::SESSION_ENDING); |
151 } | 160 } |
152 | 161 |
153 } // namespace | 162 } // namespace |
OLD | NEW |