Fix FullscreenController tests with simplified-fullscreen-ui flag.

chrome/browser/ui/exclusive_access/fullscreen_controller_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 
 using content::WebContents;
 using ui::PAGE_TRANSITION_TYPED;
 
 IN_PROC_BROWSER_TEST_F(FullscreenControllerTest,
                        PendingMouseLockExitsOnTabSwitch) {
+  // This test doesn't make sense in simplified mode, since we never prompt for
+  // mouse lock.
+  if (ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled())
+    return;
+
   AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED);
   AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED);
   WebContents* tab1 = browser()->tab_strip_model()->GetActiveWebContents();
 
   // Request mouse lock. Bubble is displayed.
   RequestToLockMouse(true, false);
   ASSERT_TRUE(IsFullscreenBubbleDisplayed());
 
   // Activate current tab. Mouse lock bubble remains.
   browser()->tab_strip_model()->ActivateTabAt(0, true);
@@ skipping 13 matching lines @@
   RequestToLockMouse(true, false);
   ASSERT_TRUE(IsFullscreenBubbleDisplayed());
 
   // Close first tab while second active. Mouse lock bubble remains.
   chrome::CloseWebContents(browser(), tab1, false);
   ASSERT_TRUE(IsFullscreenBubbleDisplayed());
 }
 
 IN_PROC_BROWSER_TEST_F(FullscreenControllerTest,
                        PendingMouseLockExitsOnTabClose) {
+  // This test doesn't make sense in simplified mode, since we never prompt for
+  // mouse lock.
+  if (ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled())
+    return;
+
   // Add more tabs.
   AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED);
   AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED);
 
   // Request mouse lock. Bubble is displayed.
   RequestToLockMouse(true, false);
   ASSERT_TRUE(IsFullscreenBubbleDisplayed());
 
   // Close tab. Bubble is cleared.
   {
     MouseLockNotificationObserver mouse_lock_observer;
     chrome::CloseTab(browser());
     mouse_lock_observer.Wait();
   }
   ASSERT_FALSE(IsFullscreenBubbleDisplayed());
 }
 
 IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, MouseLockOnFileURL) {
   static const base::FilePath::CharType* kEmptyFile =
       FILE_PATH_LITERAL("empty.html");
   GURL file_url(ui_test_utils::GetTestUrl(
       base::FilePath(base::FilePath::kCurrentDirectory),
       base::FilePath(kEmptyFile)));
   AddTabAtIndex(0, file_url, PAGE_TRANSITION_TYPED);
   RequestToLockMouse(true, false);
   ASSERT_TRUE(IsFullscreenBubbleDisplayed());
-  ASSERT_TRUE(IsFullscreenBubbleDisplayingButtons());
+  if (ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled())
+    ASSERT_FALSE(IsFullscreenBubbleDisplayingButtons());
+  else
+    ASSERT_TRUE(IsFullscreenBubbleDisplayingButtons());
 }
 
 IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, FullscreenOnFileURL) {
   static const base::FilePath::CharType* kEmptyFile =
       FILE_PATH_LITERAL("empty.html");
   GURL file_url(ui_test_utils::GetTestUrl(
       base::FilePath(base::FilePath::kCurrentDirectory),
       base::FilePath(kEmptyFile)));
   AddTabAtIndex(0, file_url, PAGE_TRANSITION_TYPED);
-  RequestToLockMouse(true, false);
+  GetFullscreenController()->EnterFullscreenModeForTab(
+      browser()->tab_strip_model()->GetActiveWebContents(),
+      file_url.GetOrigin());
   ASSERT_TRUE(IsFullscreenBubbleDisplayed());
-  ASSERT_TRUE(IsFullscreenBubbleDisplayingButtons());
+  if (ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled())
+    ASSERT_FALSE(IsFullscreenBubbleDisplayingButtons());
+  else
+    ASSERT_TRUE(IsFullscreenBubbleDisplayingButtons());
 }
 
 IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, PermissionContentSettings) {
   ASSERT_TRUE(embedded_test_server()->Start());
   GURL url = embedded_test_server()->GetURL(kFullscreenMouseLockHTML);
   ui_test_utils::NavigateToURL(browser(), url);
 
   EXPECT_FALSE(browser()->window()->IsFullscreen());
 
   // The content's origin is not allowed to go fullscreen.
@@ skipping 11 matching lines @@
 
   // The content's origin is still not allowed to go fullscreen.
   EXPECT_EQ(
       CONTENT_SETTING_ASK,
       HostContentSettingsMapFactory::GetForProfile(browser()->profile())
           ->GetContentSetting(url.GetOrigin(),
                               url.GetOrigin(),
                               CONTENT_SETTINGS_TYPE_FULLSCREEN,
                               std::string()));
 
-  AcceptCurrentFullscreenOrMouseLockRequest();
+  if (ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled()) {
+    ASSERT_FALSE(IsFullscreenBubbleDisplayingButtons());
+  } else {
+    ASSERT_TRUE(IsFullscreenBubbleDisplayingButtons());
+    // It only makes sense to test this on the non-simplified mode. In the
+    // simplified mode, you cannot accept the request (as it is auto-accepted)
+    // so you can't set ALLOW.
+    AcceptCurrentFullscreenOrMouseLockRequest();
 
-  // The content's origin is allowed to go fullscreen.
-  EXPECT_EQ(
-      CONTENT_SETTING_ALLOW,
-      HostContentSettingsMapFactory::GetForProfile(browser()->profile())
-          ->GetContentSetting(url.GetOrigin(),
-                              url.GetOrigin(),
-                              CONTENT_SETTINGS_TYPE_FULLSCREEN,
-                              std::string()));
+    // The content's origin is allowed to go fullscreen.
+    EXPECT_EQ(CONTENT_SETTING_ALLOW,
+              HostContentSettingsMapFactory::GetForProfile(browser()->profile())
+                  ->GetContentSetting(url.GetOrigin(), url.GetOrigin(),
+                                      CONTENT_SETTINGS_TYPE_FULLSCREEN,
+                                      std::string()));
+  }
 
   // The primary and secondary patterns have been set when setting the
   // permission, thus setting another secondary pattern shouldn't work.
   EXPECT_EQ(
       CONTENT_SETTING_ASK,
       HostContentSettingsMapFactory::GetForProfile(browser()->profile())
           ->GetContentSetting(url.GetOrigin(),
                               GURL("https://test.com"),
                               CONTENT_SETTINGS_TYPE_FULLSCREEN,
                               std::string()));
 
   HostContentSettingsMapFactory::GetForProfile(browser()->profile())
       ->ClearSettingsForOneType(CONTENT_SETTINGS_TYPE_FULLSCREEN);
 }