| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/browser/extensions/extension_apitest.h" | 5 #include "chrome/browser/extensions/extension_apitest.h" |
| 6 | 6 |
| 7 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 7 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
| 8 #include "chrome/browser/prefs/pref_service.h" | 8 #include "chrome/browser/prefs/pref_service.h" |
| 9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 #if defined(OS_LINUX) | 24 #if defined(OS_LINUX) |
| 25 #define MAYBE_FocusWindowDoesNotExitFullscreen \ | 25 #define MAYBE_FocusWindowDoesNotExitFullscreen \ |
| 26 DISABLED_FocusWindowDoesNotExitFullscreen | 26 DISABLED_FocusWindowDoesNotExitFullscreen |
| 27 #define MAYBE_UpdateWindowSizeExitsFullscreen \ | 27 #define MAYBE_UpdateWindowSizeExitsFullscreen \ |
| 28 DISABLED_UpdateWindowSizeExitsFullscreen | 28 DISABLED_UpdateWindowSizeExitsFullscreen |
| 29 #define MAYBE_UpdateWindowShowState \ | 29 #define MAYBE_UpdateWindowShowState \ |
| 30 DISABLED_UpdateWindowShowState | 30 DISABLED_UpdateWindowShowState |
| 31 #else | 31 #else |
| 32 #define MAYBE_FocusWindowDoesNotExitFullscreen FocusWindowDoesNotExitFullscreen | 32 #define MAYBE_FocusWindowDoesNotExitFullscreen FocusWindowDoesNotExitFullscreen |
| 33 #define MAYBE_UpdateWindowSizeExitsFullscreen UpdateWindowSizeExitsFullscreen | 33 #define MAYBE_UpdateWindowSizeExitsFullscreen UpdateWindowSizeExitsFullscreen |
| 34 |
| 35 // http://crbug.com/105356 , this test is failing browser_tests on Windows. |
| 36 #if defined(OS_WIN) |
| 37 #define MAYBE_UpdateWindowShowState FAILS_UpdateWindowShowState |
| 38 #else |
| 34 #define MAYBE_UpdateWindowShowState UpdateWindowShowState | 39 #define MAYBE_UpdateWindowShowState UpdateWindowShowState |
| 35 #endif | 40 #endif |
| 36 | 41 |
| 42 #endif |
| 43 |
| 37 // In the touch build, this fails reliably. http://crbug.com/85191 | 44 // In the touch build, this fails reliably. http://crbug.com/85191 |
| 38 #if defined(TOUCH_UI) | 45 #if defined(TOUCH_UI) |
| 39 #define MAYBE_GetViewsOfCreatedWindow DISABLED_GetViewsOfCreatedWindow | 46 #define MAYBE_GetViewsOfCreatedWindow DISABLED_GetViewsOfCreatedWindow |
| 40 #else | 47 #else |
| 41 #define MAYBE_GetViewsOfCreatedWindow GetViewsOfCreatedWindow | 48 #define MAYBE_GetViewsOfCreatedWindow GetViewsOfCreatedWindow |
| 42 #endif | 49 #endif |
| 43 | 50 |
| 44 // In the touch build, this fails unreliably. http://crbug.com/85226 | 51 // In the touch build, this fails unreliably. http://crbug.com/85226 |
| 45 #if defined(TOUCH_UI) | 52 #if defined(TOUCH_UI) |
| 46 #define MAYBE_GetViewsOfCreatedPopup FLAKY_GetViewsOfCreatedPopup | 53 #define MAYBE_GetViewsOfCreatedPopup FLAKY_GetViewsOfCreatedPopup |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 } | 234 } |
| 228 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_GetViewsOfCreatedWindow) { | 235 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_GetViewsOfCreatedWindow) { |
| 229 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) | 236 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) |
| 230 << message_; | 237 << message_; |
| 231 } | 238 } |
| 232 | 239 |
| 233 // Adding a new test? Awesome. But API tests are the old hotness. The | 240 // Adding a new test? Awesome. But API tests are the old hotness. The |
| 234 // new hotness is extension_test_utils. See extension_tabs_test.cc for | 241 // new hotness is extension_test_utils. See extension_tabs_test.cc for |
| 235 // an example. We are trying to phase out many uses of API tests as | 242 // an example. We are trying to phase out many uses of API tests as |
| 236 // they tend to be flaky. | 243 // they tend to be flaky. |
| OLD | NEW |