Enable all ESC-Fullscreen tests (Chrome Apps) for all platforms.

chrome/browser/apps/app_window_interactive_uitest.cc

 // Copyright 2013 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 "apps/ui/native_app_window.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/test/base/interactive_test_utils.h"
 
-using namespace apps;
+using apps::NativeAppWindow;
 
 // Helper class that has to be created in the stack to check if the fullscreen
 // setting of a NativeWindow has changed since the creation of the object.
 class FullscreenChangeWaiter {
  public:
   explicit FullscreenChangeWaiter(NativeAppWindow* window)
       : window_(window),
         initial_fullscreen_state_(window_->IsFullscreen()) {}
 
   void Wait() {
-    while (initial_fullscreen_state_ != window_->IsFullscreen())
+    while (initial_fullscreen_state_ == window_->IsFullscreen())
       content::RunAllPendingInMessageLoop();
   }
 
  private:
   NativeAppWindow* window_;
   bool initial_fullscreen_state_;
 
   DISALLOW_COPY_AND_ASSIGN(FullscreenChangeWaiter);
 };
 
@@ skipping 20 matching lines @@
 
   bool SimulateKeyPress(ui::KeyboardCode key) {
     return ui_test_utils::SendKeyPressToWindowSync(
       GetFirstShellWindow()->GetNativeWindow(),
       key,
       false,
       false,
       false,
       false);
   }
+
+  // This method will wait until the application is able to ack a key event.
+  void WaitUntilKeyFocus() {
+    ExtensionTestMessageListener key_listener("KEY_RECEIVED", false);
+
+    while (!key_listener.was_satisfied()) {
+      ASSERT_TRUE(SimulateKeyPress(ui::VKEY_Z));
+      content::RunAllPendingInMessageLoop();
+    }
+  }
 };
 
-#if defined(OS_LINUX) && defined(USE_AURA)
-// These tests do not work on Linux Aura because when the window is raised, the
-// content is not focused thus do not get the key events.
-// See http://crbug.com/324346
-#define MAYBE_ESCDoesNotLeaveFullscreenWindow \
-  DISABLED_ESCDoesNotLeaveFullscreenWindow
-#define MAYBE_ESCDoesNotLeaveFullscreenDOM DISABLED_ESCDoesNotLeaveFullscreenDOM
-// These tests are failing on Linux Aura for unknown reasons.
-#define MAYBE_ESCLeavesFullscreenWindow DISABLED_ESCLeavesFullscreenWindow
-#define MAYBE_ESCLeavesFullscreenDOM DISABLED_ESCLeavesFullscreenDOM
-#elif defined(OS_MACOSX)
-// These tests are highly flaky on MacOS.
-#define MAYBE_ESCLeavesFullscreenWindow DISABLED_ESCLeavesFullscreenWindow
-#define MAYBE_ESCLeavesFullscreenDOM DISABLED_ESCLeavesFullscreenDOM
-#define MAYBE_ESCDoesNotLeaveFullscreenWindow \
-  DISABLED_ESCDoesNotLeaveFullscreenWindow
-#define MAYBE_ESCDoesNotLeaveFullscreenDOM DISABLED_ESCDoesNotLeaveFullscreenDOM
-#else
-#define MAYBE_ESCLeavesFullscreenWindow ESCLeavesFullscreenWindow
-#define MAYBE_ESCLeavesFullscreenDOM ESCLeavesFullscreenDOM
-#define MAYBE_ESCDoesNotLeaveFullscreenWindow ESCDoesNotLeaveFullscreenWindow
-#define MAYBE_ESCDoesNotLeaveFullscreenDOM ESCDoesNotLeaveFullscreenDOM
-#endif
-
-IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest,
-                       MAYBE_ESCLeavesFullscreenWindow) {
+IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, ESCLeavesFullscreenWindow) {
   ExtensionTestMessageListener launched_listener("Launched", true);
   LoadAndLaunchPlatformApp("leave_fullscreen");
   ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
 
+  // We start by making sure the window is actually focused.
+  ASSERT_TRUE(ui_test_utils::ShowAndFocusNativeWindow(
+                GetFirstShellWindow()->GetNativeWindow()));

[koz (OOO until 15th September), 2014/01/08 23:29:25]

nit: I think the second line should be indented 4 spaces from ASSERT_TRUE(, ie:

  ASSERT_TRUE(...(
      GetFirstShellWindow(...)));

[mlamouri (slow - plz ping), 2014/01/09 17:08:46]

Done.

+
   // When receiving the reply, the application will try to go fullscreen using
   // the Window API but there is no synchronous way to know if that actually
   // succeeded. Also, failure will not be notified. A failure case will only be
   // known with a timeout.
   {
     FullscreenChangeWaiter fs_changed(GetFirstShellWindow()->GetBaseWindow());
 
     launched_listener.Reply("window");
 
     fs_changed.Wait();
   }
 
+  // Depending on the platform, going fullscreen might create an animation.
+  // We want to make sure that the ESC key we will send next is actually going
+  // to be received and the application might not receive key events during the
+  // animation so we should wait for the key focus to be back.
+  WaitUntilKeyFocus();
+
   // Same idea as above but for leaving fullscreen. Fullscreen mode should be
   // left when ESC is received.
   {
     FullscreenChangeWaiter fs_changed(GetFirstShellWindow()->GetBaseWindow());
 
     ASSERT_TRUE(SimulateKeyPress(ui::VKEY_ESCAPE));
 
     fs_changed.Wait();
   }
 }
 
-IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, MAYBE_ESCLeavesFullscreenDOM) {
+IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, ESCLeavesFullscreenDOM) {
   ExtensionTestMessageListener launched_listener("Launched", true);
   LoadAndLaunchPlatformApp("leave_fullscreen");
   ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
 
+  // We start by making sure the window is actually focused.
+  ASSERT_TRUE(ui_test_utils::ShowAndFocusNativeWindow(
+                GetFirstShellWindow()->GetNativeWindow()));
+
   launched_listener.Reply("dom");
 
   // Because the DOM way to go fullscreen requires user gesture, we simulate a
   // key event to get the window entering in fullscreen mode. The reply will
   // make the window listen for the key event. The reply will be sent to the
   // renderer process before the keypress and should be received in that order.
   // When receiving the key event, the application will try to go fullscreen
   // using the Window API but there is no synchronous way to know if that
   // actually succeeded. Also, failure will not be notified. A failure case will
   // only be known with a timeout.
   {
     FullscreenChangeWaiter fs_changed(GetFirstShellWindow()->GetBaseWindow());
 
     ASSERT_TRUE(SimulateKeyPress(ui::VKEY_A));
 
     fs_changed.Wait();
   }
 
+  // Depending on the platform, going fullscreen might create an animation.
+  // We want to make sure that the ESC key we will send next is actually going
+  // to be received and the application might not receive key events during the
+  // animation so we should wait for the key focus to be back.
+  WaitUntilKeyFocus();
+
   // Same idea as above but for leaving fullscreen. Fullscreen mode should be
   // left when ESC is received.
   {
     FullscreenChangeWaiter fs_changed(GetFirstShellWindow()->GetBaseWindow());
 
     ASSERT_TRUE(SimulateKeyPress(ui::VKEY_ESCAPE));
 
     fs_changed.Wait();
   }
 }
 
 IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest,
-                       MAYBE_ESCDoesNotLeaveFullscreenWindow) {
+                       ESCDoesNotLeaveFullscreenWindow) {
   ExtensionTestMessageListener launched_listener("Launched", true);
   LoadAndLaunchPlatformApp("prevent_leave_fullscreen");
   ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
 
+  // We start by making sure the window is actually focused.
+  ASSERT_TRUE(ui_test_utils::ShowAndFocusNativeWindow(
+                GetFirstShellWindow()->GetNativeWindow()));
+
   // When receiving the reply, the application will try to go fullscreen using
   // the Window API but there is no synchronous way to know if that actually
   // succeeded. Also, failure will not be notified. A failure case will only be
   // known with a timeout.
   {
     FullscreenChangeWaiter fs_changed(GetFirstShellWindow()->GetBaseWindow());
 
     launched_listener.Reply("window");
 
     fs_changed.Wait();
   }
 
+  // Depending on the platform, going fullscreen might create an animation.
+  // We want to make sure that the ESC key we will send next is actually going
+  // to be received and the application might not receive key events during the
+  // animation so we should wait for the key focus to be back.
+  WaitUntilKeyFocus();
+
   ASSERT_TRUE(SimulateKeyPress(ui::VKEY_ESCAPE));
 
   ExtensionTestMessageListener second_key_listener("B_KEY_RECEIVED", false);
 
   ASSERT_TRUE(SimulateKeyPress(ui::VKEY_B));
 
   ASSERT_TRUE(second_key_listener.WaitUntilSatisfied());
 
   // We assume that at that point, if we had to leave fullscreen, we should be.
   // However, by nature, we can not guarantee that and given that we do test
   // that nothing happens, we might end up with random-success when the feature
   // is broken.
   EXPECT_TRUE(GetFirstShellWindow()->GetBaseWindow()->IsFullscreen());
 }
 
 IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest,
-                       MAYBE_ESCDoesNotLeaveFullscreenDOM) {
+                       ESCDoesNotLeaveFullscreenDOM) {
   ExtensionTestMessageListener launched_listener("Launched", true);
   LoadAndLaunchPlatformApp("prevent_leave_fullscreen");
   ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
 
+  // We start by making sure the window is actually focused.
+  ASSERT_TRUE(ui_test_utils::ShowAndFocusNativeWindow(
+                GetFirstShellWindow()->GetNativeWindow()));
+
   launched_listener.Reply("dom");
 
   // Because the DOM way to go fullscreen requires user gesture, we simulate a
   // key event to get the window entering in fullscreen mode. The reply will
   // make the window listen for the key event. The reply will be sent to the
   // renderer process before the keypress and should be received in that order.
   // When receiving the key event, the application will try to go fullscreen
   // using the Window API but there is no synchronous way to know if that
   // actually succeeded. Also, failure will not be notified. A failure case will
   // only be known with a timeout.
   {
     FullscreenChangeWaiter fs_changed(GetFirstShellWindow()->GetBaseWindow());
 
     ASSERT_TRUE(SimulateKeyPress(ui::VKEY_A));
 
     fs_changed.Wait();
   }
 
+  // Depending on the platform, going fullscreen might create an animation.
+  // We want to make sure that the ESC key we will send next is actually going
+  // to be received and the application might not receive key events during the
+  // animation so we should wait for the key focus to be back.
+  WaitUntilKeyFocus();

[koz (OOO until 15th September), 2014/01/08 23:29:25]

It might make sense to name this WaitForFullscreenAnimationToComplete() or
something, then the duplicated comments won't be necessary.

[mlamouri (slow - plz ping), 2014/01/09 17:08:46]

But we might want to re-use that logic for other tests that require key focus.
If the name isn't clear about what the function is doing, we might miss this
re-usability.

+
   ASSERT_TRUE(SimulateKeyPress(ui::VKEY_ESCAPE));
 
   ExtensionTestMessageListener second_key_listener("B_KEY_RECEIVED", false);
 
   ASSERT_TRUE(SimulateKeyPress(ui::VKEY_B));
 
   ASSERT_TRUE(second_key_listener.WaitUntilSatisfied());
 
   // We assume that at that point, if we had to leave fullscreen, we should be.
   // However, by nature, we can not guarantee that and given that we do test
@@ skipping 11 matching lines @@
 #if (defined(OS_LINUX) && defined(USE_AURA)) || \
     defined(OS_WIN) || defined(OS_MACOSX)
 #define MAYBE_TestCreate DISABLED_TestCreate
 #else
 #define MAYBE_TestCreate TestCreate
 #endif
 
 IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, MAYBE_TestCreate) {
   ASSERT_TRUE(RunAppWindowInteractiveTest("testCreate")) << message_;
 }