Add ViewsSimplifiedFullscreenUI to the fieldtrial testing config on Mac

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"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 
 using url::kAboutBlankURL;
 using content::WebContents;
 using ui::PAGE_TRANSITION_TYPED;
 
 namespace {
 
 const base::FilePath::CharType* kSimpleFile = FILE_PATH_LITERAL("/simple.html");
@@ skipping 29 matching lines @@
     return browser()->IsMouseLocked();
   }
 
   void TestFullscreenMouseLockContentSettings();
 
  private:
    void ToggleTabFullscreen_Internal(bool enter_fullscreen,
                                      bool retry_until_success);
 };
 
+// Allow the test harness to pick the non-simplified fullscreen UI, which
+// prompts with an interactive dialog rather than just notifying the user how to
+// exit fullscreen. TODO(tapted): Remove this when "simplified" is the only way.
+enum TestType {
+  TEST_TYPE_START,
+  PROMPTING = TEST_TYPE_START,
+  SIMPLIFIED,
+  TEST_TYPE_END,
+};
+
+class ParamaterizedFullscreenControllerInteractiveTest
+    : public FullscreenControllerInteractiveTest,
+      public ::testing::WithParamInterface<int> {
+ public:
+  ParamaterizedFullscreenControllerInteractiveTest() {}
+
+  // content::BrowserTestBase:
+  void SetUpCommandLine(base::CommandLine* command_line) override {
+    switch (GetParam()) {
+      case PROMPTING:
+        command_line->AppendSwitchASCII(
+            switches::kDisableFeatures,
+            ExclusiveAccessManager::kSimplifiedUIFeature.name);
+        break;
+      case SIMPLIFIED:
+        command_line->AppendSwitchASCII(
+            switches::kEnableFeatures,
+            ExclusiveAccessManager::kSimplifiedUIFeature.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);
+};

[Ilya Sherman, 2016/02/24 01:31:19]

I'm not sure that any of this is necessary.  I think the only needed change is
the ShouldPrompt() check within the test, based on the current command-line
flags.  Everything else should be being configured by the test harness.

+
 void FullscreenControllerInteractiveTest::ToggleTabFullscreen(
     bool enter_fullscreen) {
   ToggleTabFullscreen_Internal(enter_fullscreen, true);
 }
 
 // |ToggleTabFullscreen| should not need to tolerate the transition failing.
 // Most fullscreen tests run sharded in fullscreen_controller_browsertest.cc
 // and some flakiness has occurred when calling |ToggleTabFullscreen|, so that
 // method has been made robust by retrying if the transition fails.
 // The root cause of that flakiness should still be tracked down, see
@@ skipping 589 matching lines @@
 // Flaky on Windows, Linux, CrOS: http://crbug.com/159000
 #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
 #define MAYBE_MouseLockSilentAfterTargetUnlock \
   DISABLED_MouseLockSilentAfterTargetUnlock
 #else
 #define MAYBE_MouseLockSilentAfterTargetUnlock MouseLockSilentAfterTargetUnlock
 #endif
 
 // Tests mouse lock can be exited and re-entered by an application silently
 // with no UI distraction for users.
-IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
+IN_PROC_BROWSER_TEST_P(ParamaterizedFullscreenControllerInteractiveTest,
                        MAYBE_MouseLockSilentAfterTargetUnlock) {
   ASSERT_TRUE(embedded_test_server()->Start());
   ui_test_utils::NavigateToURL(
       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());
-  ASSERT_TRUE(IsMouseLockPermissionRequested());
-  ASSERT_FALSE(IsMouseLocked());
+  if (ShouldPrompt()) {
+    ASSERT_TRUE(IsMouseLockPermissionRequested());
+    ASSERT_FALSE(IsMouseLocked());
 
-  // Accept mouse lock.
-  AcceptCurrentFullscreenOrMouseLockRequest();
+    // 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 247 matching lines @@
 
   GURL url = embedded_test_server()->GetURL("/simple.html");
   AddTabAtIndex(0, url, PAGE_TRANSITION_TYPED);
 
   // Validate that going fullscreen for a URL defaults to asking permision.
   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));