Commit b1bc72ef authored by David Bienvenu's avatar David Bienvenu Committed by Commit Bot

Fix WindowOcclusionTrackerTest flakiness due to NativeWinOcclusion.

This disables the background Native Window Occlusion calculation for
WindowOcclusionTrackerTest tests, because it can interfere with
the expectations of the tests.

Bug: 1007338
Change-Id: Ia4e91a9b5ea748f5ed7e243175a020f69d4d59a3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1822897Reviewed-by: default avatarFrançois Doray <fdoray@chromium.org>
Commit-Queue: David Bienvenu <davidbienvenu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#699453}
parent 01447c87
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
#include "base/run_loop.h" #include "base/run_loop.h"
#include "base/test/bind_test_util.h" #include "base/test/bind_test_util.h"
#include "base/test/gtest_util.h" #include "base/test/gtest_util.h"
#include "base/test/scoped_feature_list.h"
#include "build/build_config.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "ui/aura/env.h" #include "ui/aura/env.h"
#include "ui/aura/test/aura_test_base.h" #include "ui/aura/test/aura_test_base.h"
...@@ -16,6 +18,7 @@ ...@@ -16,6 +18,7 @@
#include "ui/aura/test/test_windows.h" #include "ui/aura/test/test_windows.h"
#include "ui/aura/test/window_occlusion_tracker_test_api.h" #include "ui/aura/test/window_occlusion_tracker_test_api.h"
#include "ui/aura/window_observer.h" #include "ui/aura/window_observer.h"
#include "ui/base/ui_base_features.h"
#include "ui/compositor/layer_animation_observer.h" #include "ui/compositor/layer_animation_observer.h"
#include "ui/compositor/layer_animation_sequence.h" #include "ui/compositor/layer_animation_sequence.h"
#include "ui/compositor/layer_animator.h" #include "ui/compositor/layer_animator.h"
...@@ -73,6 +76,17 @@ class WindowOcclusionTrackerTest : public test::AuraTestBase { ...@@ -73,6 +76,17 @@ class WindowOcclusionTrackerTest : public test::AuraTestBase {
public: public:
WindowOcclusionTrackerTest() = default; WindowOcclusionTrackerTest() = default;
#if defined(OS_WIN)
void SetUp() override {
// Native Window Occlusion calculation runs in the background and can
// interfere with the expectations of these tests, so, disable it.
scoped_feature_list_.InitWithFeatures(
/*enabled_features=*/{},
/*disabled_features=*/{features::kCalculateNativeWinOcclusion});
AuraTestBase::SetUp();
}
#endif
Window* CreateTrackedWindow(MockWindowDelegate* delegate, Window* CreateTrackedWindow(MockWindowDelegate* delegate,
const gfx::Rect& bounds, const gfx::Rect& bounds,
Window* parent = nullptr, Window* parent = nullptr,
...@@ -102,6 +116,8 @@ class WindowOcclusionTrackerTest : public test::AuraTestBase { ...@@ -102,6 +116,8 @@ class WindowOcclusionTrackerTest : public test::AuraTestBase {
} }
private: private:
base::test::ScopedFeatureList scoped_feature_list_;
DISALLOW_COPY_AND_ASSIGN(WindowOcclusionTrackerTest); DISALLOW_COPY_AND_ASSIGN(WindowOcclusionTrackerTest);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment