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 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
173 #else | 173 #else |
174 #define MAYBE_FullscreenMouseLockContentSettings \ | 174 #define MAYBE_FullscreenMouseLockContentSettings \ |
175 FullscreenMouseLockContentSettings | 175 FullscreenMouseLockContentSettings |
176 #endif | 176 #endif |
177 // Tests fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK. | 177 // Tests fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK. |
178 IN_PROC_BROWSER_TEST_F(FullscreenControllerBrowserTest, | 178 IN_PROC_BROWSER_TEST_F(FullscreenControllerBrowserTest, |
179 MAYBE_FullscreenMouseLockContentSettings) { | 179 MAYBE_FullscreenMouseLockContentSettings) { |
180 TestFullscreenMouseLockContentSettings(); | 180 TestFullscreenMouseLockContentSettings(); |
181 } | 181 } |
182 | 182 |
183 #if defined(OS_MACOSX) | 183 #if defined(OS_MACOSX) || defined(OS_LINUX) |
184 // http://crbug.com/103912 | 184 // http://crbug.com/103912 Mac |
| 185 // http://crbug.com/143930 Linux |
185 #define MAYBE_BrowserFullscreenMouseLockContentSettings \ | 186 #define MAYBE_BrowserFullscreenMouseLockContentSettings \ |
186 DISABLED_BrowserFullscreenMouseLockContentSettings | 187 DISABLED_BrowserFullscreenMouseLockContentSettings |
187 #else | 188 #else |
188 #define MAYBE_BrowserFullscreenMouseLockContentSettings \ | 189 #define MAYBE_BrowserFullscreenMouseLockContentSettings \ |
189 BrowserFullscreenMouseLockContentSettings | 190 BrowserFullscreenMouseLockContentSettings |
190 #endif | 191 #endif |
191 // Tests fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK, | 192 // Tests fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK, |
192 // but with the browser initiated in fullscreen mode first. | 193 // but with the browser initiated in fullscreen mode first. |
193 IN_PROC_BROWSER_TEST_F(FullscreenControllerBrowserTest, | 194 IN_PROC_BROWSER_TEST_F(FullscreenControllerBrowserTest, |
194 MAYBE_BrowserFullscreenMouseLockContentSettings) { | 195 MAYBE_BrowserFullscreenMouseLockContentSettings) { |
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
429 ASSERT_TRUE(IsFullscreenBubbleDisplayed()); | 430 ASSERT_TRUE(IsFullscreenBubbleDisplayed()); |
430 | 431 |
431 // Close tab. Bubble is cleared. | 432 // Close tab. Bubble is cleared. |
432 { | 433 { |
433 MouseLockNotificationObserver mouse_lock_observer; | 434 MouseLockNotificationObserver mouse_lock_observer; |
434 chrome::CloseTab(browser()); | 435 chrome::CloseTab(browser()); |
435 mouse_lock_observer.Wait(); | 436 mouse_lock_observer.Wait(); |
436 } | 437 } |
437 ASSERT_FALSE(IsFullscreenBubbleDisplayed()); | 438 ASSERT_FALSE(IsFullscreenBubbleDisplayed()); |
438 } | 439 } |
OLD | NEW |