Chromium Code Reviews Chromium Code Reviews
Issue 9702055:
Automated tests for full screen & mouse lock M16 features (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src| 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 <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/file_path.h" | 9 #include "base/file_path.h" |
| 10 #if defined(OS_MACOSX) | 10 #if defined(OS_MACOSX) |
| 11 #include "base/mac/mac_util.h" | 11 #include "base/mac/mac_util.h" |
| 12 #endif | 12 #endif |
| 13 #include "base/sys_info.h" | 13 #include "base/sys_info.h" |
| 14 #include "base/utf_string_conversions.h" | 14 #include "base/utf_string_conversions.h" |
| 15 #include "chrome/app/chrome_command_ids.h" | 15 #include "chrome/app/chrome_command_ids.h" |
| 16 #include "chrome/browser/command_updater.h" | 16 #include "chrome/browser/command_updater.h" |
| 17 #include "chrome/browser/content_settings/host_content_settings_map.h" | |
| 17 #include "chrome/browser/defaults.h" | 18 #include "chrome/browser/defaults.h" |
| 18 #include "chrome/browser/extensions/extension_browsertest.h" | 19 #include "chrome/browser/extensions/extension_browsertest.h" |
| 19 #include "chrome/browser/extensions/extension_service.h" | 20 #include "chrome/browser/extensions/extension_service.h" |
| 20 #include "chrome/browser/extensions/extension_tab_helper.h" | 21 #include "chrome/browser/extensions/extension_tab_helper.h" |
| 21 #include "chrome/browser/first_run/first_run.h" | 22 #include "chrome/browser/first_run/first_run.h" |
| 22 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 23 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
| 23 #include "chrome/browser/profiles/profile.h" | 24 #include "chrome/browser/profiles/profile.h" |
| 24 #include "chrome/browser/tabs/pinned_tab_codec.h" | 25 #include "chrome/browser/tabs/pinned_tab_codec.h" |
| 25 #include "chrome/browser/tabs/tab_strip_model.h" | 26 #include "chrome/browser/tabs/tab_strip_model.h" |
| 26 #include "chrome/browser/translate/translate_tab_helper.h" | 27 #include "chrome/browser/translate/translate_tab_helper.h" |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 79 "<html><head><title>beforeunload</title></head><body>" | 80 "<html><head><title>beforeunload</title></head><body>" |
| 80 "<script>window.onbeforeunload=function(e){return 'foo'}</script>" | 81 "<script>window.onbeforeunload=function(e){return 'foo'}</script>" |
| 81 "</body></html>"; | 82 "</body></html>"; |
| 82 | 83 |
| 83 const char* kOpenNewBeforeUnloadPage = | 84 const char* kOpenNewBeforeUnloadPage = |
| 84 "w=window.open(); w.onbeforeunload=function(e){return 'foo'};"; | 85 "w=window.open(); w.onbeforeunload=function(e){return 'foo'};"; |
| 85 | 86 |
| 86 const FilePath::CharType* kBeforeUnloadFile = | 87 const FilePath::CharType* kBeforeUnloadFile = |
| 87 FILE_PATH_LITERAL("beforeunload.html"); | 88 FILE_PATH_LITERAL("beforeunload.html"); |
| 88 | 89 |
| 90 const FilePath::CharType* kSimpleFile = FILE_PATH_LITERAL("simple.html"); | |
| 89 const FilePath::CharType* kTitle1File = FILE_PATH_LITERAL("title1.html"); | 91 const FilePath::CharType* kTitle1File = FILE_PATH_LITERAL("title1.html"); |
| 90 const FilePath::CharType* kTitle2File = FILE_PATH_LITERAL("title2.html"); | 92 const FilePath::CharType* kTitle2File = FILE_PATH_LITERAL("title2.html"); |
| 91 | 93 |
| 92 const FilePath::CharType kDocRoot[] = FILE_PATH_LITERAL("chrome/test/data"); | 94 const FilePath::CharType kDocRoot[] = FILE_PATH_LITERAL("chrome/test/data"); |
| 93 | 95 |
| 94 // Given a page title, returns the expected window caption string. | 96 // Given a page title, returns the expected window caption string. |
| 95 std::wstring WindowCaptionFromPageTitle(std::wstring page_title) { | 97 std::wstring WindowCaptionFromPageTitle(std::wstring page_title) { |
| 96 #if defined(OS_MACOSX) || defined(OS_CHROMEOS) | 98 #if defined(OS_MACOSX) || defined(OS_CHROMEOS) |
| 97 // On Mac or ChromeOS, we don't want to suffix the page title with | 99 // On Mac or ChromeOS, we don't want to suffix the page title with |
| 98 // the application name. | 100 // the application name. |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 169 } | 171 } |
| 170 | 172 |
| 171 virtual std::string GetHTMLContents() OVERRIDE { | 173 virtual std::string GetHTMLContents() OVERRIDE { |
| 172 return "<h1>INTERSTITIAL</h1>"; | 174 return "<h1>INTERSTITIAL</h1>"; |
| 173 } | 175 } |
| 174 | 176 |
| 175 private: | 177 private: |
| 176 InterstitialPage* interstitial_page_; // Owns us. | 178 InterstitialPage* interstitial_page_; // Owns us. |
| 177 }; | 179 }; |
| 178 | 180 |
| 181 // Fullscreen transition notification observer simplifies test code. | |
| 182 class FullscreenNotificationObserver | |
| 183 : public ui_test_utils::WindowedNotificationObserver { | |
| 184 public: | |
| 185 FullscreenNotificationObserver() : WindowedNotificationObserver( | |
| 186 chrome::NOTIFICATION_FULLSCREEN_CHANGED, | |
| 187 content::NotificationService::AllSources()) {} | |
| 188 }; | |
|
sky
2012/03/22 22:48:10
private: DISALLOW_...
scheib
2012/03/26 23:30:46
Done.
| |
| 189 | |
| 179 } // namespace | 190 } // namespace |
| 180 | 191 |
| 181 class BrowserTest : public ExtensionBrowserTest { | 192 class BrowserTest : public ExtensionBrowserTest { |
| 182 protected: | 193 protected: |
| 183 // In RTL locales wrap the page title with RTL embedding characters so that it | 194 // In RTL locales wrap the page title with RTL embedding characters so that it |
| 184 // matches the value returned by GetWindowTitle(). | 195 // matches the value returned by GetWindowTitle(). |
| 185 std::wstring LocaleWindowCaptionFromPageTitle( | 196 std::wstring LocaleWindowCaptionFromPageTitle( |
| 186 const std::wstring& expected_title) { | 197 const std::wstring& expected_title) { |
| 187 std::wstring page_title = WindowCaptionFromPageTitle(expected_title); | 198 std::wstring page_title = WindowCaptionFromPageTitle(expected_title); |
| 188 #if defined(OS_WIN) | 199 #if defined(OS_WIN) |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 204 const ExtensionSet* extensions = | 215 const ExtensionSet* extensions = |
| 205 browser()->profile()->GetExtensionService()->extensions(); | 216 browser()->profile()->GetExtensionService()->extensions(); |
| 206 for (ExtensionSet::const_iterator it = extensions->begin(); | 217 for (ExtensionSet::const_iterator it = extensions->begin(); |
| 207 it != extensions->end(); ++it) { | 218 it != extensions->end(); ++it) { |
| 208 if ((*it)->name() == "App Test") | 219 if ((*it)->name() == "App Test") |
| 209 return *it; | 220 return *it; |
| 210 } | 221 } |
| 211 NOTREACHED(); | 222 NOTREACHED(); |
| 212 return NULL; | 223 return NULL; |
| 213 } | 224 } |
| 225 | |
| 226 void ToggleTabFullscreen(WebContents* tab, bool enter_fullscreen) { | |
|
sky
2012/03/22 22:48:10
Since this ASSERTs you need to wrap all calls to i
scheib
2012/03/26 23:30:46
Done.
| |
| 227 if (IsFullscreenForBrowser()) { | |
| 228 // Changing tab fullscreen state will not actually change the window | |
| 229 // when browser fullscreen is in effect. | |
| 230 browser()->ToggleFullscreenModeForTab(tab, enter_fullscreen); | |
| 231 } else { // Not in browser fullscreen, expect window to actually change. | |
| 232 FullscreenNotificationObserver fullscreen_observer; | |
| 233 browser()->ToggleFullscreenModeForTab(tab, enter_fullscreen); | |
| 234 fullscreen_observer.Wait(); | |
| 235 ASSERT_EQ(browser()->window()->IsFullscreen(), enter_fullscreen); | |
| 236 } | |
| 237 } | |
| 238 | |
| 239 void ToggleBrowserFullscreen(bool enter_fullscreen) { | |
| 240 ASSERT_EQ(browser()->window()->IsFullscreen(), !enter_fullscreen); | |
| 241 FullscreenNotificationObserver fullscreen_observer; | |
| 242 | |
| 243 browser()->ToggleFullscreenMode(); | |
| 244 | |
| 245 fullscreen_observer.Wait(); | |
| 246 ASSERT_EQ(browser()->window()->IsFullscreen(), enter_fullscreen); | |
| 247 ASSERT_EQ(IsFullscreenForBrowser(), enter_fullscreen); | |
| 248 } | |
| 249 | |
| 250 void RequestToLockMouse(content::WebContents* tab) { | |
| 251 browser()->RequestToLockMouse(tab); | |
| 252 } | |
| 253 | |
| 254 void LostMouseLock() { | |
| 255 browser()->LostMouseLock(); | |
| 256 } | |
| 257 | |
| 258 bool IsFullscreenForBrowser() { | |
| 259 return browser()->fullscreen_controller_->IsFullscreenForBrowser(); | |
| 260 } | |
| 261 | |
| 262 bool IsFullscreenForTabOrPending() { | |
| 263 return browser()->IsFullscreenForTabOrPending(); | |
| 264 } | |
| 265 | |
| 266 bool IsMouseLockedOrPending() { | |
| 267 return browser()->IsMouseLockedOrPending(); | |
| 268 } | |
| 269 | |
| 270 bool IsMouseLockPermissionRequested() { | |
| 271 FullscreenExitBubbleType type = | |
| 272 browser()->fullscreen_controller_->GetFullscreenExitBubbleType(); | |
| 273 bool mouse_lock = false; | |
| 274 fullscreen_bubble::PermissionRequestedByType(type, NULL, &mouse_lock); | |
| 275 return mouse_lock; | |
| 276 } | |
| 277 | |
| 278 bool IsFullscreenPermissionRequested() { | |
| 279 FullscreenExitBubbleType type = | |
| 280 browser()->fullscreen_controller_->GetFullscreenExitBubbleType(); | |
| 281 bool fullscreen = false; | |
| 282 fullscreen_bubble::PermissionRequestedByType(type, &fullscreen, NULL); | |
| 283 return fullscreen; | |
| 284 } | |
| 285 | |
| 286 FullscreenExitBubbleType GetFullscreenExitBubbleType() { | |
| 287 return browser()->fullscreen_controller_->GetFullscreenExitBubbleType(); | |
| 288 } | |
| 289 | |
| 290 bool IsFullscreenBubbleDisplayed() { | |
| 291 FullscreenExitBubbleType type = | |
| 292 browser()->fullscreen_controller_->GetFullscreenExitBubbleType(); | |
| 293 // TODO(scheib): Should be FEB_TYPE_NONE, crbug.com/107013 will include fix. | |
| 294 return type != FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION; | |
| 295 } | |
| 296 | |
| 297 bool IsFullscreenBubbleDisplayingButtons() { | |
| 298 FullscreenExitBubbleType type = | |
| 299 browser()->fullscreen_controller_->GetFullscreenExitBubbleType(); | |
| 300 return fullscreen_bubble::ShowButtonsForType(type); | |
| 301 } | |
| 302 | |
| 303 void AcceptCurrentFullscreenOrMouseLockRequest() { | |
| 304 WebContents* fullscreen_tab = browser()->GetSelectedWebContents(); | |
| 305 FullscreenExitBubbleType type = | |
| 306 browser()->fullscreen_controller_->GetFullscreenExitBubbleType(); | |
| 307 browser()->OnAcceptFullscreenPermission(fullscreen_tab->GetURL(), type); | |
| 308 } | |
| 309 | |
| 310 // Helper method to be called by multiple tests. | |
| 311 void TestFullscreenMouseLockContentSettings(); | |
| 214 }; | 312 }; |
| 215 | 313 |
| 216 // Launch the app on a page with no title, check that the app title was set | 314 // Launch the app on a page with no title, check that the app title was set |
| 217 // correctly. | 315 // correctly. |
| 218 IN_PROC_BROWSER_TEST_F(BrowserTest, NoTitle) { | 316 IN_PROC_BROWSER_TEST_F(BrowserTest, NoTitle) { |
| 219 ui_test_utils::NavigateToURL(browser(), | 317 ui_test_utils::NavigateToURL(browser(), |
| 220 ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory), | 318 ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory), |
| 221 FilePath(kTitle1File))); | 319 FilePath(kTitle1File))); |
| 222 EXPECT_EQ(LocaleWindowCaptionFromPageTitle(L"title1.html"), | 320 EXPECT_EQ(LocaleWindowCaptionFromPageTitle(L"title1.html"), |
| 223 UTF16ToWideHack(browser()->GetWindowTitleForCurrentTab())); | 321 UTF16ToWideHack(browser()->GetWindowTitleForCurrentTab())); |
| (...skipping 644 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 868 EXPECT_EQ("fr", helper->language_state().original_language()); | 966 EXPECT_EQ("fr", helper->language_state().original_language()); |
| 869 } | 967 } |
| 870 | 968 |
| 871 #if defined(OS_MACOSX) | 969 #if defined(OS_MACOSX) |
| 872 // http://crbug.com/104265 | 970 // http://crbug.com/104265 |
| 873 #define MAYBE_TestNewTabExitsFullscreen DISABLED_TestNewTabExitsFullscreen | 971 #define MAYBE_TestNewTabExitsFullscreen DISABLED_TestNewTabExitsFullscreen |
| 874 #else | 972 #else |
| 875 #define MAYBE_TestNewTabExitsFullscreen TestNewTabExitsFullscreen | 973 #define MAYBE_TestNewTabExitsFullscreen TestNewTabExitsFullscreen |
| 876 #endif | 974 #endif |
| 877 | 975 |
| 976 // Tests that while in fullscreen creating a new tab will exit fullscreen. | |
| 878 IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_TestNewTabExitsFullscreen) { | 977 IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_TestNewTabExitsFullscreen) { |
| 879 ASSERT_TRUE(test_server()->Start()); | 978 ASSERT_TRUE(test_server()->Start()); |
| 880 | 979 |
| 881 AddTabAtIndex( | 980 AddTabAtIndex( |
| 882 0, GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); | 981 0, GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); |
| 883 | 982 |
| 884 WebContents* fullscreen_tab = browser()->GetSelectedWebContents(); | 983 WebContents* fullscreen_tab = browser()->GetSelectedWebContents(); |
| 885 | 984 |
| 886 { | 985 ToggleTabFullscreen(fullscreen_tab, true); |
| 887 ui_test_utils::WindowedNotificationObserver fullscreen_observer( | |
| 888 chrome::NOTIFICATION_FULLSCREEN_CHANGED, | |
| 889 content::NotificationService::AllSources()); | |
| 890 browser()->ToggleFullscreenModeForTab(fullscreen_tab, true); | |
| 891 fullscreen_observer.Wait(); | |
| 892 ASSERT_TRUE(browser()->window()->IsFullscreen()); | |
| 893 } | |
| 894 | 986 |
| 895 { | 987 { |
| 896 ui_test_utils::WindowedNotificationObserver fullscreen_observer( | 988 FullscreenNotificationObserver fullscreen_observer; |
| 897 chrome::NOTIFICATION_FULLSCREEN_CHANGED, | |
| 898 content::NotificationService::AllSources()); | |
| 899 AddTabAtIndex( | 989 AddTabAtIndex( |
| 900 1, GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); | 990 1, GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); |
| 901 fullscreen_observer.Wait(); | 991 fullscreen_observer.Wait(); |
| 902 ASSERT_FALSE(browser()->window()->IsFullscreen()); | 992 ASSERT_FALSE(browser()->window()->IsFullscreen()); |
| 903 } | 993 } |
| 904 } | 994 } |
| 905 | 995 |
| 906 #if defined(OS_MACOSX) | 996 #if defined(OS_MACOSX) |
| 907 // http://crbug.com/100467 | 997 // http://crbug.com/100467 |
| 908 #define MAYBE_TestTabExitsItselfFromFullscreen \ | 998 #define MAYBE_TestTabExitsItselfFromFullscreen \ |
| 909 FAILS_TestTabExitsItselfFromFullscreen | 999 FAILS_TestTabExitsItselfFromFullscreen |
| 910 #else | 1000 #else |
| 911 #define MAYBE_TestTabExitsItselfFromFullscreen TestTabExitsItselfFromFullscreen | 1001 #define MAYBE_TestTabExitsItselfFromFullscreen TestTabExitsItselfFromFullscreen |
| 912 #endif | 1002 #endif |
| 913 | 1003 |
| 1004 // Tests a tab exiting fullscreen will bring the browser out of fullscreen. | |
| 914 IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_TestTabExitsItselfFromFullscreen) { | 1005 IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_TestTabExitsItselfFromFullscreen) { |
| 915 ASSERT_TRUE(test_server()->Start()); | 1006 ASSERT_TRUE(test_server()->Start()); |
| 916 | 1007 |
| 917 AddTabAtIndex( | 1008 AddTabAtIndex( |
| 918 0, GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); | 1009 0, GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); |
| 919 | 1010 |
| 920 WebContents* fullscreen_tab = browser()->GetSelectedWebContents(); | 1011 WebContents* fullscreen_tab = browser()->GetSelectedWebContents(); |
| 921 | 1012 ToggleTabFullscreen(fullscreen_tab, true); |
| 922 { | 1013 ToggleTabFullscreen(fullscreen_tab, false); |
| 923 ui_test_utils::WindowedNotificationObserver fullscreen_observer( | |
| 924 chrome::NOTIFICATION_FULLSCREEN_CHANGED, | |
| 925 content::NotificationService::AllSources()); | |
| 926 browser()->ToggleFullscreenModeForTab(fullscreen_tab, true); | |
| 927 fullscreen_observer.Wait(); | |
| 928 ASSERT_TRUE(browser()->window()->IsFullscreen()); | |
| 929 } | |
| 930 | |
| 931 { | |
| 932 ui_test_utils::WindowedNotificationObserver fullscreen_observer( | |
| 933 chrome::NOTIFICATION_FULLSCREEN_CHANGED, | |
| 934 content::NotificationService::AllSources()); | |
| 935 browser()->ToggleFullscreenModeForTab(fullscreen_tab, false); | |
| 936 fullscreen_observer.Wait(); | |
| 937 ASSERT_FALSE(browser()->window()->IsFullscreen()); | |
| 938 } | |
| 939 } | 1014 } |
| 940 | 1015 |
| 1016 // Tests entering fullscreen and then requesting mouse lock results in | |
| 1017 // buttons for the user, and that after confirming the buttons are dismissed. | |
| 941 IN_PROC_BROWSER_TEST_F(BrowserTest, TestFullscreenBubbleMouseLockState) { | 1018 IN_PROC_BROWSER_TEST_F(BrowserTest, TestFullscreenBubbleMouseLockState) { |
| 942 ASSERT_TRUE(test_server()->Start()); | 1019 ASSERT_TRUE(test_server()->Start()); |
| 943 | 1020 |
| 944 AddTabAtIndex(0, GURL(chrome::kAboutBlankURL), | 1021 AddTabAtIndex(0, GURL(chrome::kAboutBlankURL), |
| 945 content::PAGE_TRANSITION_TYPED); | 1022 content::PAGE_TRANSITION_TYPED); |
| 946 AddTabAtIndex(1, GURL(chrome::kAboutBlankURL), | 1023 AddTabAtIndex(1, GURL(chrome::kAboutBlankURL), |
| 947 content::PAGE_TRANSITION_TYPED); | 1024 content::PAGE_TRANSITION_TYPED); |
| 948 | 1025 |
| 949 WebContents* fullscreen_tab = browser()->GetSelectedWebContents(); | 1026 WebContents* fullscreen_tab = browser()->GetSelectedWebContents(); |
| 950 | 1027 |
| 951 { | 1028 ToggleTabFullscreen(fullscreen_tab, true); |
| 952 ui_test_utils::WindowedNotificationObserver fullscreen_observer( | |
| 953 chrome::NOTIFICATION_FULLSCREEN_CHANGED, | |
| 954 content::NotificationService::AllSources()); | |
| 955 browser()->ToggleFullscreenModeForTab(fullscreen_tab, true); | |
| 956 fullscreen_observer.Wait(); | |
| 957 ASSERT_TRUE(browser()->window()->IsFullscreen()); | |
| 958 } | |
| 959 | 1029 |
| 960 browser()->RequestToLockMouse(fullscreen_tab); | 1030 // Request mouse lock and verify the bubble is waiting for user confirmation. |
| 961 FullscreenExitBubbleType type = | 1031 RequestToLockMouse(fullscreen_tab); |
| 962 browser()->fullscreen_controller_->GetFullscreenExitBubbleType(); | 1032 ASSERT_TRUE(IsMouseLockPermissionRequested()); |
| 963 bool mouse_lock = false; | |
| 964 fullscreen_bubble::PermissionRequestedByType(type, NULL, &mouse_lock); | |
| 965 ASSERT_TRUE(mouse_lock); | |
| 966 | 1033 |
| 967 browser()->OnAcceptFullscreenPermission(fullscreen_tab->GetURL(), type); | 1034 // Accept mouse lock and verify bubble no longer shows confirmation buttons. |
| 968 type = browser()->fullscreen_controller_->GetFullscreenExitBubbleType(); | 1035 AcceptCurrentFullscreenOrMouseLockRequest(); |
| 969 ASSERT_FALSE(fullscreen_bubble::ShowButtonsForType(type)); | 1036 ASSERT_FALSE(IsFullscreenBubbleDisplayingButtons()); |
| 1037 } | |
| 1038 | |
| 1039 // Tests mouse lock fails before fullscreen is entered. | |
| 1040 IN_PROC_BROWSER_TEST_F(BrowserTest, MouseLockThenFullscreen) { | |
| 1041 WebContents* tab = browser()->GetSelectedWebContents(); | |
| 1042 ASSERT_FALSE(IsFullscreenBubbleDisplayed()); | |
| 1043 | |
| 1044 RequestToLockMouse(tab); | |
| 1045 ASSERT_FALSE(IsFullscreenBubbleDisplayed()); | |
| 1046 | |
| 1047 ToggleTabFullscreen(tab, true); | |
| 1048 ASSERT_TRUE(IsFullscreenPermissionRequested()); | |
| 1049 ASSERT_FALSE(IsMouseLockPermissionRequested()); | |
| 1050 } | |
| 1051 | |
| 1052 // Helper method to be called by multiple tests. | |
| 1053 // Tests Fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK. | |
| 1054 void BrowserTest::TestFullscreenMouseLockContentSettings() { | |
| 1055 GURL url = test_server()->GetURL("simple.html"); | |
| 1056 AddTabAtIndex(0, url, content::PAGE_TRANSITION_TYPED); | |
| 1057 WebContents* tab = browser()->GetSelectedWebContents(); | |
| 1058 | |
| 1059 // Validate that going fullscreen for a URL defaults to asking permision. | |
| 1060 ASSERT_FALSE(IsFullscreenPermissionRequested()); | |
| 1061 ToggleTabFullscreen(tab, true); | |
| 1062 ASSERT_TRUE(IsFullscreenPermissionRequested()); | |
| 1063 ToggleTabFullscreen(tab, false); | |
| 1064 | |
| 1065 // Add content setting to ALLOW fullscreen. | |
| 1066 HostContentSettingsMap* settings_map = | |
| 1067 browser()->profile()->GetHostContentSettingsMap(); | |
| 1068 ContentSettingsPattern pattern = | |
| 1069 ContentSettingsPattern::FromURL(url); | |
| 1070 settings_map->SetContentSetting( | |
| 1071 pattern, ContentSettingsPattern::Wildcard(), | |
| 1072 CONTENT_SETTINGS_TYPE_FULLSCREEN, std::string(), | |
| 1073 CONTENT_SETTING_ALLOW); | |
| 1074 | |
| 1075 // Now, fullscreen should not prompt for permission. | |
| 1076 ASSERT_FALSE(IsFullscreenPermissionRequested()); | |
| 1077 ToggleTabFullscreen(tab, true); | |
| 1078 ASSERT_FALSE(IsFullscreenPermissionRequested()); | |
| 1079 | |
| 1080 // Leaving tab in fullscreen, now test mouse lock ALLOW: | |
| 1081 | |
| 1082 // Validate that mouse lock defaults to asking permision. | |
| 1083 ASSERT_FALSE(IsMouseLockPermissionRequested()); | |
| 1084 ASSERT_FALSE(IsMouseLockedOrPending()); | |
| 1085 RequestToLockMouse(tab); | |
| 1086 ASSERT_TRUE(IsMouseLockPermissionRequested()); | |
| 1087 ASSERT_TRUE(IsMouseLockedOrPending()); | |
| 1088 LostMouseLock(); | |
| 1089 | |
| 1090 // Add content setting to ALLOW mouse lock. | |
| 1091 settings_map->SetContentSetting( | |
| 1092 pattern, ContentSettingsPattern::Wildcard(), | |
| 1093 CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string(), | |
| 1094 CONTENT_SETTING_ALLOW); | |
| 1095 | |
| 1096 // Now, mouse lock should not prompt for permission. | |
| 1097 ASSERT_FALSE(IsMouseLockedOrPending()); | |
| 1098 ASSERT_FALSE(IsMouseLockPermissionRequested()); | |
| 1099 RequestToLockMouse(tab); | |
| 1100 ASSERT_TRUE(IsMouseLockedOrPending()); | |
| 1101 ASSERT_FALSE(IsMouseLockPermissionRequested()); | |
| 1102 LostMouseLock(); | |
| 1103 | |
| 1104 // Leaving tab in fullscreen, now test mouse lock BLOCK: | |
| 1105 | |
| 1106 // Add content setting to BLOCK mouse lock. | |
| 1107 settings_map->SetContentSetting( | |
| 1108 pattern, ContentSettingsPattern::Wildcard(), | |
| 1109 CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string(), | |
| 1110 CONTENT_SETTING_BLOCK); | |
| 1111 | |
| 1112 // Now, mouse lock should not be pending. | |
| 1113 ASSERT_FALSE(IsMouseLockedOrPending()); | |
| 1114 ASSERT_FALSE(IsMouseLockPermissionRequested()); | |
| 1115 RequestToLockMouse(tab); | |
| 1116 ASSERT_FALSE(IsMouseLockedOrPending()); | |
| 1117 ASSERT_FALSE(IsMouseLockPermissionRequested()); | |
| 1118 } | |
| 1119 | |
| 1120 // Tests fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK. | |
| 1121 IN_PROC_BROWSER_TEST_F(BrowserTest, FullscreenMouseLockContentSettings) { | |
| 1122 TestFullscreenMouseLockContentSettings(); | |
| 1123 } | |
| 1124 | |
| 1125 // Tests fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK, | |
| 1126 // but with the browser initiated in fullscreen mode first. | |
| 1127 IN_PROC_BROWSER_TEST_F(BrowserTest, BrowserFullscreenMouseLockContentSettings) { | |
| 1128 // Enter browser fullscreen first. | |
| 1129 ToggleBrowserFullscreen(true); | |
| 1130 TestFullscreenMouseLockContentSettings(); | |
| 1131 ToggleBrowserFullscreen(false); | |
| 1132 } | |
| 1133 | |
| 1134 // Tests Fullscreen entered in Browser, then Tab mode, then exited via Browser. | |
| 1135 IN_PROC_BROWSER_TEST_F(BrowserTest, BrowserFullscreenExit) { | |
| 1136 // Enter browser fullscreen. | |
| 1137 ToggleBrowserFullscreen(true); | |
| 1138 | |
| 1139 // Enter tab fullscreen. | |
| 1140 AddTabAtIndex(0, GURL(chrome::kAboutBlankURL), | |
| 1141 content::PAGE_TRANSITION_TYPED); | |
| 1142 WebContents* fullscreen_tab = browser()->GetSelectedWebContents(); | |
| 1143 ToggleTabFullscreen(fullscreen_tab, true); | |
| 1144 | |
| 1145 // Exit browser fullscreen. | |
| 1146 ToggleBrowserFullscreen(false); | |
| 1147 ASSERT_FALSE(browser()->window()->IsFullscreen()); | |
| 1148 } | |
| 1149 | |
| 1150 // Tests Browser Fullscreen remains active after Tab mode entered and exited. | |
| 1151 IN_PROC_BROWSER_TEST_F(BrowserTest, BrowserFullscreenAfterTabFSExit) { | |
| 1152 // Enter browser fullscreen. | |
| 1153 ToggleBrowserFullscreen(true); | |
| 1154 | |
| 1155 // Enter and then exit tab fullscreen. | |
| 1156 AddTabAtIndex(0, GURL(chrome::kAboutBlankURL), | |
| 1157 content::PAGE_TRANSITION_TYPED); | |
| 1158 WebContents* fullscreen_tab = browser()->GetSelectedWebContents(); | |
| 1159 ToggleTabFullscreen(fullscreen_tab, true); | |
| 1160 ToggleTabFullscreen(fullscreen_tab, false); | |
| 1161 | |
| 1162 // Verify browser fullscreen still active. | |
| 1163 ASSERT_TRUE(IsFullscreenForBrowser()); | |
| 1164 } | |
| 1165 | |
| 1166 // Tests fullscreen entered without permision prompt for file:// urls. | |
| 1167 IN_PROC_BROWSER_TEST_F(BrowserTest, FullscreenFileURL) { | |
| 1168 ui_test_utils::NavigateToURL(browser(), | |
| 1169 ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory), | |
| 1170 FilePath(kSimpleFile))); | |
| 1171 WebContents* tab = browser()->GetSelectedWebContents(); | |
| 1172 | |
| 1173 // Validate that going fullscreen for a file does not ask permision. | |
| 1174 ASSERT_FALSE(IsFullscreenPermissionRequested()); | |
| 1175 ToggleTabFullscreen(tab, true); | |
| 1176 ASSERT_FALSE(IsFullscreenPermissionRequested()); | |
| 1177 ToggleTabFullscreen(tab, false); | |
| 970 } | 1178 } |
| 971 | 1179 |
| 972 #if defined(OS_MACOSX) | 1180 #if defined(OS_MACOSX) |
| 973 // http://crbug.com/100467 | 1181 // http://crbug.com/100467 |
| 974 IN_PROC_BROWSER_TEST_F( | 1182 IN_PROC_BROWSER_TEST_F( |
| 975 BrowserTest, FAILS_TabEntersPresentationModeFromWindowed) { | 1183 BrowserTest, FAILS_TabEntersPresentationModeFromWindowed) { |
| 976 ASSERT_TRUE(test_server()->Start()); | 1184 ASSERT_TRUE(test_server()->Start()); |
| 977 | 1185 |
| 978 AddTabAtIndex( | 1186 AddTabAtIndex( |
| 979 0, GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); | 1187 0, GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); |
| 980 | 1188 |
| 981 WebContents* fullscreen_tab = browser()->GetSelectedWebContents(); | 1189 WebContents* fullscreen_tab = browser()->GetSelectedWebContents(); |
| 982 | 1190 |
| 983 { | 1191 { |
| 984 ui_test_utils::WindowedNotificationObserver fullscreen_observer( | 1192 FullscreenNotificationObserver fullscreen_observer; |
| 985 chrome::NOTIFICATION_FULLSCREEN_CHANGED, | |
| 986 content::NotificationService::AllSources()); | |
| 987 EXPECT_FALSE(browser()->window()->IsFullscreen()); | 1193 EXPECT_FALSE(browser()->window()->IsFullscreen()); |
| 988 EXPECT_FALSE(browser()->window()->InPresentationMode()); | 1194 EXPECT_FALSE(browser()->window()->InPresentationMode()); |
| 989 browser()->ToggleFullscreenModeForTab(fullscreen_tab, true); | 1195 browser()->ToggleFullscreenModeForTab(fullscreen_tab, true); |
| 990 fullscreen_observer.Wait(); | 1196 fullscreen_observer.Wait(); |
| 991 ASSERT_TRUE(browser()->window()->IsFullscreen()); | 1197 ASSERT_TRUE(browser()->window()->IsFullscreen()); |
| 992 ASSERT_TRUE(browser()->window()->InPresentationMode()); | 1198 ASSERT_TRUE(browser()->window()->InPresentationMode()); |
| 993 } | 1199 } |
| 994 | 1200 |
| 995 { | 1201 { |
| 996 ui_test_utils::WindowedNotificationObserver fullscreen_observer( | 1202 FullscreenNotificationObserver fullscreen_observer; |
| 997 chrome::NOTIFICATION_FULLSCREEN_CHANGED, | |
| 998 content::NotificationService::AllSources()); | |
| 999 browser()->TogglePresentationMode(); | 1203 browser()->TogglePresentationMode(); |
| 1000 fullscreen_observer.Wait(); | 1204 fullscreen_observer.Wait(); |
| 1001 ASSERT_FALSE(browser()->window()->IsFullscreen()); | 1205 ASSERT_FALSE(browser()->window()->IsFullscreen()); |
| 1002 ASSERT_FALSE(browser()->window()->InPresentationMode()); | 1206 ASSERT_FALSE(browser()->window()->InPresentationMode()); |
| 1003 } | 1207 } |
| 1004 | 1208 |
| 1005 if (base::mac::IsOSLionOrLater()) { | 1209 if (base::mac::IsOSLionOrLater()) { |
| 1006 // Test that tab fullscreen mode doesn't make presentation mode the default | 1210 // Test that tab fullscreen mode doesn't make presentation mode the default |
| 1007 // on Lion. | 1211 // on Lion. |
| 1008 ui_test_utils::WindowedNotificationObserver fullscreen_observer( | 1212 FullscreenNotificationObserver fullscreen_observer; |
| 1009 chrome::NOTIFICATION_FULLSCREEN_CHANGED, | |
| 1010 content::NotificationService::AllSources()); | |
| 1011 browser()->ToggleFullscreenMode(); | 1213 browser()->ToggleFullscreenMode(); |
| 1012 fullscreen_observer.Wait(); | 1214 fullscreen_observer.Wait(); |
| 1013 ASSERT_TRUE(browser()->window()->IsFullscreen()); | 1215 ASSERT_TRUE(browser()->window()->IsFullscreen()); |
| 1014 ASSERT_FALSE(browser()->window()->InPresentationMode()); | 1216 ASSERT_FALSE(browser()->window()->InPresentationMode()); |
| 1015 } | 1217 } |
| 1016 } | 1218 } |
| 1017 #endif | 1219 #endif |
| 1018 | 1220 |
| 1019 // Chromeos defaults to restoring the last session, so this test isn't | 1221 // Chromeos defaults to restoring the last session, so this test isn't |
| 1020 // applicable. | 1222 // applicable. |
| (...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1539 | 1741 |
| 1540 // The normal browser should now have four. | 1742 // The normal browser should now have four. |
| 1541 EXPECT_EQ(4, browser()->tab_count()); | 1743 EXPECT_EQ(4, browser()->tab_count()); |
| 1542 | 1744 |
| 1543 // Close the additional browsers. | 1745 // Close the additional browsers. |
| 1544 popup_browser->CloseAllTabs(); | 1746 popup_browser->CloseAllTabs(); |
| 1545 app_browser->CloseAllTabs(); | 1747 app_browser->CloseAllTabs(); |
| 1546 app_popup_browser->CloseAllTabs(); | 1748 app_popup_browser->CloseAllTabs(); |
| 1547 } | 1749 } |
| 1548 #endif | 1750 #endif |
| OLD | NEW |
