| 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 "chrome/browser/extensions/extension_apitest.h" | 5 #include "chrome/browser/extensions/extension_apitest.h" |
| 6 | 6 |
| 7 #include "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
| 8 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 8 #include "chrome/browser/prefs/incognito_mode_prefs.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 14 matching lines...) Expand all Loading... |
| 25 // so these tests fail on linux/gtk. http://crbug.com/72369 | 25 // so these tests fail on linux/gtk. http://crbug.com/72369 |
| 26 #if defined(OS_LINUX) && !defined(USE_AURA) | 26 #if defined(OS_LINUX) && !defined(USE_AURA) |
| 27 #define MAYBE_FocusWindowDoesNotExitFullscreen \ | 27 #define MAYBE_FocusWindowDoesNotExitFullscreen \ |
| 28 DISABLED_FocusWindowDoesNotExitFullscreen | 28 DISABLED_FocusWindowDoesNotExitFullscreen |
| 29 #define MAYBE_UpdateWindowSizeExitsFullscreen \ | 29 #define MAYBE_UpdateWindowSizeExitsFullscreen \ |
| 30 DISABLED_UpdateWindowSizeExitsFullscreen | 30 DISABLED_UpdateWindowSizeExitsFullscreen |
| 31 #define MAYBE_UpdateWindowResize DISABLED_UpdateWindowResize | 31 #define MAYBE_UpdateWindowResize DISABLED_UpdateWindowResize |
| 32 #define MAYBE_UpdateWindowShowState DISABLED_UpdateWindowShowState | 32 #define MAYBE_UpdateWindowShowState DISABLED_UpdateWindowShowState |
| 33 #else | 33 #else |
| 34 | 34 |
| 35 #if defined(USE_AURA) || defined(OS_MACOSX) | 35 #if defined(USE_AURA) || defined(OS_MACOSX) || defined(OS_WIN) |
| 36 // Maximizing/fullscreen popup window doesn't work on aura's managed mode. | 36 // Maximizing/fullscreen popup window doesn't work on aura's managed mode. |
| 37 // See bug crbug.com/116305. | 37 // See bug crbug.com/116305. |
| 38 // Mac: http://crbug.com/103912 | 38 // Mac: http://crbug.com/103912 |
| 39 // Failing on Win7: http://crbug.com/176683 |
| 39 #define MAYBE_UpdateWindowShowState DISABLED_UpdateWindowShowState | 40 #define MAYBE_UpdateWindowShowState DISABLED_UpdateWindowShowState |
| 40 #else | 41 #else |
| 41 #define MAYBE_UpdateWindowShowState UpdateWindowShowState | 42 #define MAYBE_UpdateWindowShowState UpdateWindowShowState |
| 42 #endif // defined(USE_AURA) || defined(OS_MACOSX) | 43 #endif // defined(USE_AURA) || defined(OS_MACOSX) || defined(OS_WIN) |
| 43 | 44 |
| 44 // TODO(linux_aura) http://crbug.com/163931 | 45 // TODO(linux_aura) http://crbug.com/163931 |
| 45 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA) | 46 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA) |
| 46 #define MAYBE_FocusWindowDoesNotExitFullscreen \ | 47 #define MAYBE_FocusWindowDoesNotExitFullscreen \ |
| 47 DISABLED_FocusWindowDoesNotExitFullscreen | 48 DISABLED_FocusWindowDoesNotExitFullscreen |
| 48 #else | 49 #else |
| 49 #define MAYBE_FocusWindowDoesNotExitFullscreen FocusWindowDoesNotExitFullscreen | 50 #define MAYBE_FocusWindowDoesNotExitFullscreen FocusWindowDoesNotExitFullscreen |
| 50 #endif | 51 #endif |
| 51 | 52 |
| 52 #define MAYBE_UpdateWindowSizeExitsFullscreen UpdateWindowSizeExitsFullscreen | 53 #define MAYBE_UpdateWindowSizeExitsFullscreen UpdateWindowSizeExitsFullscreen |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 244 << message_; | 245 << message_; |
| 245 } | 246 } |
| 246 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_GetViewsOfCreatedWindow) { | 247 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_GetViewsOfCreatedWindow) { |
| 247 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) | 248 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) |
| 248 << message_; | 249 << message_; |
| 249 } | 250 } |
| 250 | 251 |
| 251 // Adding a new test? Awesome. But API tests are the old hotness. The | 252 // Adding a new test? Awesome. But API tests are the old hotness. The |
| 252 // new hotness is extension_test_utils. See tabs_test.cc for an example. | 253 // new hotness is extension_test_utils. See tabs_test.cc for an example. |
| 253 // We are trying to phase out many uses of API tests as they tend to be flaky. | 254 // We are trying to phase out many uses of API tests as they tend to be flaky. |
| OLD | NEW |