Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Side by Side Diff: chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc

Issue 589513004: Disable flaky lscreenControllerInteractiveTest.MouseLockSilentAfterTargetUnlock on CrOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "build/build_config.h" 5 #include "build/build_config.h"
6 #include "chrome/browser/content_settings/host_content_settings_map.h" 6 #include "chrome/browser/content_settings/host_content_settings_map.h"
7 #include "chrome/browser/fullscreen.h" 7 #include "chrome/browser/fullscreen.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 638 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 649
650 // Confirm they are enabled and there is no prompt. 650 // Confirm they are enabled and there is no prompt.
651 ASSERT_FALSE(IsFullscreenBubbleDisplayed()); 651 ASSERT_FALSE(IsFullscreenBubbleDisplayed());
652 ASSERT_FALSE(IsFullscreenPermissionRequested()); 652 ASSERT_FALSE(IsFullscreenPermissionRequested());
653 ASSERT_FALSE(IsMouseLockPermissionRequested()); 653 ASSERT_FALSE(IsMouseLockPermissionRequested());
654 ASSERT_TRUE(IsMouseLocked()); 654 ASSERT_TRUE(IsMouseLocked());
655 ASSERT_TRUE(IsWindowFullscreenForTabOrPending()); 655 ASSERT_TRUE(IsWindowFullscreenForTabOrPending());
656 } 656 }
657 657
658 // TODO(erg): linux_aura bringup: http://crbug.com/163931 658 // TODO(erg): linux_aura bringup: http://crbug.com/163931
659 // Flaky on Windows: http://crbug.com/159000 659 // Flaky on Windows, Linux, CrOS: http://crbug.com/159000
660 #if defined(OS_WIN) || \ 660 #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
661 (defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA))
662 #define MAYBE_MouseLockSilentAfterTargetUnlock \ 661 #define MAYBE_MouseLockSilentAfterTargetUnlock \
663 DISABLED_MouseLockSilentAfterTargetUnlock 662 DISABLED_MouseLockSilentAfterTargetUnlock
664 #else 663 #else
665 #define MAYBE_MouseLockSilentAfterTargetUnlock MouseLockSilentAfterTargetUnlock 664 #define MAYBE_MouseLockSilentAfterTargetUnlock MouseLockSilentAfterTargetUnlock
666 #endif 665 #endif
667 666
668 // Tests mouse lock can be exited and re-entered by an application silently 667 // Tests mouse lock can be exited and re-entered by an application silently
669 // with no UI distraction for users. 668 // with no UI distraction for users.
670 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, 669 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
671 MAYBE_MouseLockSilentAfterTargetUnlock) { 670 MAYBE_MouseLockSilentAfterTargetUnlock) {
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
926 925
927 GURL url = test_server()->GetURL("simple.html"); 926 GURL url = test_server()->GetURL("simple.html");
928 AddTabAtIndex(0, url, PAGE_TRANSITION_TYPED); 927 AddTabAtIndex(0, url, PAGE_TRANSITION_TYPED);
929 928
930 // Validate that going fullscreen for a URL defaults to asking permision. 929 // Validate that going fullscreen for a URL defaults to asking permision.
931 ASSERT_FALSE(IsFullscreenPermissionRequested()); 930 ASSERT_FALSE(IsFullscreenPermissionRequested());
932 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(true)); 931 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(true));
933 ASSERT_TRUE(IsFullscreenPermissionRequested()); 932 ASSERT_TRUE(IsFullscreenPermissionRequested());
934 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(false)); 933 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(false));
935 } 934 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698