| 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/pref_service.h" | 7 #include "chrome/browser/prefs/pref_service.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/browser/ui/browser_window.h" | 10 #include "chrome/browser/ui/browser_window.h" |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 DISABLED_FocusWindowDoesNotExitFullscreen | 32 DISABLED_FocusWindowDoesNotExitFullscreen |
| 33 #define MAYBE_UpdateWindowSizeExitsFullscreen \ | 33 #define MAYBE_UpdateWindowSizeExitsFullscreen \ |
| 34 DISABLED_UpdateWindowSizeExitsFullscreen | 34 DISABLED_UpdateWindowSizeExitsFullscreen |
| 35 #else | 35 #else |
| 36 #define MAYBE_FocusWindowDoesNotExitFullscreen FocusWindowDoesNotExitFullscreen | 36 #define MAYBE_FocusWindowDoesNotExitFullscreen FocusWindowDoesNotExitFullscreen |
| 37 #define MAYBE_UpdateWindowSizeExitsFullscreen UpdateWindowSizeExitsFullscreen | 37 #define MAYBE_UpdateWindowSizeExitsFullscreen UpdateWindowSizeExitsFullscreen |
| 38 #endif | 38 #endif |
| 39 | 39 |
| 40 // Times out on Mac (especially Leopard). http://crbug.com/80212 | 40 // Times out on Mac (especially Leopard). http://crbug.com/80212 |
| 41 #if defined(OS_MACOSX) | 41 #if defined(OS_MACOSX) |
| 42 #define MAYBE_CaptureVisibleTabRace FLAKY_CaptureVisibleTabRace | 42 #define MAYBE_CaptureVisibleTabRace DISABLED_CaptureVisibleTabRace |
| 43 #else | 43 #else |
| 44 #define MAYBE_CaptureVisibleTabRace CaptureVisibleTabRace | 44 #define MAYBE_CaptureVisibleTabRace CaptureVisibleTabRace |
| 45 #endif | 45 #endif |
| 46 | 46 |
| 47 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Tabs) { | 47 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Tabs) { |
| 48 ASSERT_TRUE(StartTestServer()); | 48 ASSERT_TRUE(StartTestServer()); |
| 49 | 49 |
| 50 // The test creates a tab and checks that the URL of the new tab | 50 // The test creates a tab and checks that the URL of the new tab |
| 51 // is that of the new tab page. Make sure the pref that controls | 51 // is that of the new tab page. Make sure the pref that controls |
| 52 // this is set. | 52 // this is set. |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetViewsOfCreatedPopup) { | 162 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetViewsOfCreatedPopup) { |
| 163 ASSERT_TRUE(StartTestServer()); | 163 ASSERT_TRUE(StartTestServer()); |
| 164 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_popup.html")) | 164 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_popup.html")) |
| 165 << message_; | 165 << message_; |
| 166 } | 166 } |
| 167 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetViewsOfCreatedWindow) { | 167 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetViewsOfCreatedWindow) { |
| 168 ASSERT_TRUE(StartTestServer()); | 168 ASSERT_TRUE(StartTestServer()); |
| 169 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) | 169 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) |
| 170 << message_; | 170 << message_; |
| 171 } | 171 } |
| OLD | NEW |