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 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) | 35 #if defined(USE_AURA) || defined(OS_MACOSX) |
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 #define MAYBE_UpdateWindowShowState DISABLED_UpdateWindowShowState | 39 #define MAYBE_UpdateWindowShowState DISABLED_UpdateWindowShowState |
39 #else | 40 #else |
40 #define MAYBE_UpdateWindowShowState UpdateWindowShowState | 41 #define MAYBE_UpdateWindowShowState UpdateWindowShowState |
41 #endif // defined(USE_AURA) | 42 #endif // defined(USE_AURA) || defined(OS_MACOSX) |
42 | 43 |
43 #define MAYBE_FocusWindowDoesNotExitFullscreen FocusWindowDoesNotExitFullscreen | 44 #define MAYBE_FocusWindowDoesNotExitFullscreen FocusWindowDoesNotExitFullscreen |
44 #define MAYBE_UpdateWindowSizeExitsFullscreen UpdateWindowSizeExitsFullscreen | 45 #define MAYBE_UpdateWindowSizeExitsFullscreen UpdateWindowSizeExitsFullscreen |
45 #define MAYBE_UpdateWindowResize UpdateWindowResize | 46 #define MAYBE_UpdateWindowResize UpdateWindowResize |
46 #endif // defined(OS_LINUX) && !defined(USE_AURA) | 47 #endif // defined(OS_LINUX) && !defined(USE_AURA) |
47 | 48 |
| 49 |
48 class ExtensionApiNewTabTest : public ExtensionApiTest { | 50 class ExtensionApiNewTabTest : public ExtensionApiTest { |
49 public: | 51 public: |
50 ExtensionApiNewTabTest() {} | 52 ExtensionApiNewTabTest() {} |
51 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 53 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
52 ExtensionApiTest::SetUpCommandLine(command_line); | 54 ExtensionApiTest::SetUpCommandLine(command_line); |
53 // Override the default which InProcessBrowserTest adds if it doesn't see a | 55 // Override the default which InProcessBrowserTest adds if it doesn't see a |
54 // homepage. | 56 // homepage. |
55 command_line->AppendSwitchASCII( | 57 command_line->AppendSwitchASCII( |
56 switches::kHomePage, chrome::kChromeUINewTabURL); | 58 switches::kHomePage, chrome::kChromeUINewTabURL); |
57 } | 59 } |
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
218 } | 220 } |
219 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_GetViewsOfCreatedWindow) { | 221 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_GetViewsOfCreatedWindow) { |
220 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) | 222 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) |
221 << message_; | 223 << message_; |
222 } | 224 } |
223 | 225 |
224 // Adding a new test? Awesome. But API tests are the old hotness. The | 226 // Adding a new test? Awesome. But API tests are the old hotness. The |
225 // new hotness is extension_test_utils. See extension_tabs_test.cc for | 227 // new hotness is extension_test_utils. See extension_tabs_test.cc for |
226 // an example. We are trying to phase out many uses of API tests as | 228 // an example. We are trying to phase out many uses of API tests as |
227 // they tend to be flaky. | 229 // they tend to be flaky. |
OLD | NEW |