| 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 "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 11 matching lines...) Expand all Loading... |
| 22 // Window resizes are not completed by the time the callback happens, | 22 // Window resizes are not completed by the time the callback happens, |
| 23 // so these tests fail on linux/gtk. http://crbug.com/72369 | 23 // so these tests fail on linux/gtk. http://crbug.com/72369 |
| 24 #if defined(OS_LINUX) && !defined(USE_AURA) | 24 #if defined(OS_LINUX) && !defined(USE_AURA) |
| 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_UpdateWindowResize DISABLED_UpdateWindowResize | 29 #define MAYBE_UpdateWindowResize DISABLED_UpdateWindowResize |
| 30 #define MAYBE_UpdateWindowShowState DISABLED_UpdateWindowShowState | 30 #define MAYBE_UpdateWindowShowState DISABLED_UpdateWindowShowState |
| 31 #else | 31 #else |
| 32 |
| 33 #if defined(USE_AURA) |
| 34 // Maximizing/fullscreen popup window doesn't work on aura's managed mode. |
| 35 // See bug crbug.com/116305. |
| 36 #define MAYBE_UpdateWindowShowState DISABLED_UpdateWindowShowState |
| 37 #else |
| 38 #define MAYBE_UpdateWindowShowState UpdateWindowShowState |
| 39 #endif // defined(USE_AURA) |
| 40 |
| 32 #define MAYBE_FocusWindowDoesNotExitFullscreen FocusWindowDoesNotExitFullscreen | 41 #define MAYBE_FocusWindowDoesNotExitFullscreen FocusWindowDoesNotExitFullscreen |
| 33 #define MAYBE_UpdateWindowSizeExitsFullscreen UpdateWindowSizeExitsFullscreen | 42 #define MAYBE_UpdateWindowSizeExitsFullscreen UpdateWindowSizeExitsFullscreen |
| 34 #define MAYBE_UpdateWindowResize UpdateWindowResize | 43 #define MAYBE_UpdateWindowResize UpdateWindowResize |
| 35 #define MAYBE_UpdateWindowShowState UpdateWindowShowState | 44 #endif // defined(OS_LINUX) && !defined(USE_AURA) |
| 36 #endif | |
| 37 | 45 |
| 38 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Tabs) { | 46 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Tabs) { |
| 39 // The test creates a tab and checks that the URL of the new tab | 47 // The test creates a tab and checks that the URL of the new tab |
| 40 // is that of the new tab page. Make sure the pref that controls | 48 // is that of the new tab page. Make sure the pref that controls |
| 41 // this is set. | 49 // this is set. |
| 42 browser()->profile()->GetPrefs()->SetBoolean( | 50 browser()->profile()->GetPrefs()->SetBoolean( |
| 43 prefs::kHomePageIsNewTabPage, true); | 51 prefs::kHomePageIsNewTabPage, true); |
| 44 | 52 |
| 45 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "crud.html")) << message_; | 53 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "crud.html")) << message_; |
| 46 } | 54 } |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 } | 207 } |
| 200 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_GetViewsOfCreatedWindow) { | 208 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_GetViewsOfCreatedWindow) { |
| 201 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) | 209 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) |
| 202 << message_; | 210 << message_; |
| 203 } | 211 } |
| 204 | 212 |
| 205 // Adding a new test? Awesome. But API tests are the old hotness. The | 213 // Adding a new test? Awesome. But API tests are the old hotness. The |
| 206 // new hotness is extension_test_utils. See extension_tabs_test.cc for | 214 // new hotness is extension_test_utils. See extension_tabs_test.cc for |
| 207 // an example. We are trying to phase out many uses of API tests as | 215 // an example. We are trying to phase out many uses of API tests as |
| 208 // they tend to be flaky. | 216 // they tend to be flaky. |
| OLD | NEW |