ppapi_tests: Remove the source of flakiness from out-of-process FlashFullscreen test. No longer mark the test as

flaky.

TEST=ui_tests
BUG=108471
Review URL: https://chromiumcodereview.appspot.com/9133024

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119760 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 10 insertions, 6 deletions

diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc
index 37d3a9bd..77234c2 100644
--- a/chrome/test/ui/ppapi_uitest.cc
+++ b/chrome/test/ui/ppapi_uitest.cc
@@ -614,7 +614,7 @@ TEST_PPAPI_NACL_VIA_HTTP(FileSystem)
 #define MAYBE_OutOfProcessFlashFullscreen DISABLED_FlashFullscreen
 #else
 #define MAYBE_FlashFullscreen FlashFullscreen
-#define MAYBE_OutOfProcessFlashFullscreen FLAKY_FlashFullscreen
+#define MAYBE_OutOfProcessFlashFullscreen FlashFullscreen
 #endif
 
 TEST_F(PPAPITest, MAYBE_FlashFullscreen) {
diff --git a/ppapi/tests/test_flash_fullscreen.cc b/ppapi/tests/test_flash_fullscreen.cc
index 0d7163b..b724fef 100644
--- a/ppapi/tests/test_flash_fullscreen.cc
+++ b/ppapi/tests/test_flash_fullscreen.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -76,10 +76,14 @@ std::string TestFlashFullscreen::TestNormalToFullscreenToNormal() {
   pp::Graphics2D graphics2d_fullscreen(instance_, pp::Size(10, 10), false);
   if (graphics2d_fullscreen.is_null())
     return "Failed to create graphics2d_fullscreen";
-  if (instance_->BindGraphics(graphics2d_fullscreen))
-    return ReportError("BindGraphics() in fullscreen transition", true);
-  if (screen_mode_.IsFullscreen())
-    return ReportError("IsFullscreen() in fullscreen transtion", true);
+  // The out-of-process proxy is asynchronous, so testing for the following
+  // conditions is flaky and can only be done reliably in-process.
+  if (!testing_interface_->IsOutOfProcess()) {
+    if (instance_->BindGraphics(graphics2d_fullscreen))
+      return ReportError("BindGraphics() in fullscreen transition", true);
+    if (screen_mode_.IsFullscreen())
+      return ReportError("IsFullscreen() in fullscreen transtion", true);
+  }
 
   // DidChangeView() will call the callback once in fullscreen mode.
   fullscreen_callback_.WaitForResult();