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 "base/compiler_specific.h" | 5 #include "base/compiler_specific.h" |
6 #include "base/utf_string_conversions.h" | 6 #include "base/utf_string_conversions.h" |
7 #include "chrome/browser/content_settings/host_content_settings_map.h" | 7 #include "chrome/browser/content_settings/host_content_settings_map.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_commands.h" | 10 #include "chrome/browser/ui/browser_commands.h" |
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
167 } | 167 } |
168 | 168 |
169 #if defined(OS_MACOSX) || defined(OS_LINUX) | 169 #if defined(OS_MACOSX) || defined(OS_LINUX) |
170 // http://crbug.com/133831 | 170 // http://crbug.com/133831 |
171 #define MAYBE_FullscreenMouseLockContentSettings \ | 171 #define MAYBE_FullscreenMouseLockContentSettings \ |
172 FLAKY_FullscreenMouseLockContentSettings | 172 FLAKY_FullscreenMouseLockContentSettings |
173 #else | 173 #else |
174 #define MAYBE_FullscreenMouseLockContentSettings \ | 174 #define MAYBE_FullscreenMouseLockContentSettings \ |
175 FullscreenMouseLockContentSettings | 175 FullscreenMouseLockContentSettings |
176 #endif | 176 #endif |
177 | |
178 // Tests fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK. | 177 // Tests fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK. |
179 IN_PROC_BROWSER_TEST_F(FullscreenControllerBrowserTest, | 178 IN_PROC_BROWSER_TEST_F(FullscreenControllerBrowserTest, |
180 MAYBE_FullscreenMouseLockContentSettings) { | 179 MAYBE_FullscreenMouseLockContentSettings) { |
181 TestFullscreenMouseLockContentSettings(); | 180 TestFullscreenMouseLockContentSettings(); |
182 } | 181 } |
183 | 182 |
| 183 #if defined(OS_MACOSX) |
| 184 // http://crbug.com/103912 |
| 185 #define MAYBE_BrowserFullscreenMouseLockContentSettings \ |
| 186 DISABLED_BrowserFullscreenMouseLockContentSettings |
| 187 #else |
| 188 #define MAYBE_BrowserFullscreenMouseLockContentSettings \ |
| 189 BrowserFullscreenMouseLockContentSettings |
| 190 #endif |
184 // Tests fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK, | 191 // Tests fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK, |
185 // but with the browser initiated in fullscreen mode first. | 192 // but with the browser initiated in fullscreen mode first. |
186 IN_PROC_BROWSER_TEST_F(FullscreenControllerBrowserTest, | 193 IN_PROC_BROWSER_TEST_F(FullscreenControllerBrowserTest, |
187 BrowserFullscreenMouseLockContentSettings) { | 194 MAYBE_BrowserFullscreenMouseLockContentSettings) { |
188 // Enter browser fullscreen first. | 195 // Enter browser fullscreen first. |
189 ASSERT_NO_FATAL_FAILURE(ToggleBrowserFullscreen(true)); | 196 ASSERT_NO_FATAL_FAILURE(ToggleBrowserFullscreen(true)); |
190 TestFullscreenMouseLockContentSettings(); | 197 TestFullscreenMouseLockContentSettings(); |
191 ASSERT_NO_FATAL_FAILURE(ToggleBrowserFullscreen(false)); | 198 ASSERT_NO_FATAL_FAILURE(ToggleBrowserFullscreen(false)); |
192 } | 199 } |
193 | 200 |
194 // Tests Fullscreen entered in Browser, then Tab mode, then exited via Browser. | 201 // Tests Fullscreen entered in Browser, then Tab mode, then exited via Browser. |
195 #if defined(OS_MACOSX) | 202 #if defined(OS_MACOSX) |
196 // http://crbug.com/103912 | 203 // http://crbug.com/103912 |
197 #define MAYBE_BrowserFullscreenExit DISABLED_BrowserFullscreenExit | 204 #define MAYBE_BrowserFullscreenExit DISABLED_BrowserFullscreenExit |
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
422 ASSERT_TRUE(IsFullscreenBubbleDisplayed()); | 429 ASSERT_TRUE(IsFullscreenBubbleDisplayed()); |
423 | 430 |
424 // Close tab. Bubble is cleared. | 431 // Close tab. Bubble is cleared. |
425 { | 432 { |
426 MouseLockNotificationObserver mouse_lock_observer; | 433 MouseLockNotificationObserver mouse_lock_observer; |
427 chrome::CloseTab(browser()); | 434 chrome::CloseTab(browser()); |
428 mouse_lock_observer.Wait(); | 435 mouse_lock_observer.Wait(); |
429 } | 436 } |
430 ASSERT_FALSE(IsFullscreenBubbleDisplayed()); | 437 ASSERT_FALSE(IsFullscreenBubbleDisplayed()); |
431 } | 438 } |
OLD | NEW |