Fullscreen / mouselock: Always auto-accept (even if flag disabled).

chrome/browser/ui/exclusive_access/fullscreen_controller_interactive_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 "base/command_line.h"
 #include "build/build_config.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/fullscreen.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 85 matching lines @@
         break;
       case SIMPLIFIED:
         command_line->AppendSwitchASCII(switches::kEnableFeatures,
                                         features::kSimplifiedFullscreenUI.name);
         break;
       default:
         NOTREACHED();
     }
   }
 
-  // Whether the test should be prompting the user (i.e. non-simplified UI).
-  bool ShouldPrompt() { return GetParam() == PROMPTING; }
-
  private:
   DISALLOW_COPY_AND_ASSIGN(ParamaterizedFullscreenControllerInteractiveTest);
 };
 
 void FullscreenControllerInteractiveTest::ToggleTabFullscreen(
     bool enter_fullscreen) {
   ToggleTabFullscreen_Internal(enter_fullscreen, true);
 }
 
 // |ToggleTabFullscreen| should not need to tolerate the transition failing.
@@ skipping 602 matching lines @@
       browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML));
 
   ASSERT_FALSE(IsFullscreenBubbleDisplayed());
 
   // Lock the mouse with a user gesture.
   ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
       browser(), ui::VKEY_1, false, false, false, false,
       chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
       content::NotificationService::AllSources()));
   ASSERT_TRUE(IsFullscreenBubbleDisplayed());
-  if (ShouldPrompt()) {
-    ASSERT_TRUE(IsMouseLockPermissionRequested());
-    ASSERT_FALSE(IsMouseLocked());
-
-    // Accept mouse lock.
-    AcceptCurrentFullscreenOrMouseLockRequest();
-  }
   ASSERT_TRUE(IsMouseLocked());
   ASSERT_TRUE(IsFullscreenBubbleDisplayed());
 
   // Unlock the mouse from target, make sure it's unlocked.
   ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
         browser(), ui::VKEY_U, false, false, false, false,
         chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
         content::NotificationService::AllSources()));
   ASSERT_FALSE(IsMouseLocked());
   ASSERT_FALSE(IsFullscreenBubbleDisplayed());
@@ skipping 252 matching lines @@
   ASSERT_FALSE(IsFullscreenPermissionRequested());
   ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(true));
   ASSERT_TRUE(IsFullscreenPermissionRequested());
   ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(false));
 }
 
 INSTANTIATE_TEST_CASE_P(
     ParamaterizedFullscreenControllerInteractiveTestInstance,
     ParamaterizedFullscreenControllerInteractiveTest,
     ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END));