Commit d575b98b authored by Peter Kasting's avatar Peter Kasting Committed by Commit Bot

Set up event generator delegate for Mac browser tests as well.

This allows enabling some disabled tests on Mac.

Bug: none
Change-Id: I3b5bce542d91f40842d9ab68bac60c1b11ef9014
Reviewed-on: https://chromium-review.googlesource.com/c/1338211Reviewed-by: default avatarMichael Wasserman <msw@chromium.org>
Reviewed-by: default avatarJohn Abd-El-Malek <jam@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608911}
parent cab88242
...@@ -12,6 +12,7 @@ include_rules = [ ...@@ -12,6 +12,7 @@ include_rules = [
"+services/resource_coordinator", "+services/resource_coordinator",
"+services/service_manager", "+services/service_manager",
"+ui/ozone/public", "+ui/ozone/public",
"+ui/views/test",
"+v8/include/v8.h", "+v8/include/v8.h",
] ]
...@@ -25,7 +26,4 @@ specific_include_rules = { ...@@ -25,7 +26,4 @@ specific_include_rules = {
"+third_party/iaccessible2", "+third_party/iaccessible2",
"+ui/base/resource/resource_bundle.h", "+ui/base/resource/resource_bundle.h",
], ],
"content_browser_test.cc": [
"+ui/views/test/widget_test_api.h"
],
} }
...@@ -57,6 +57,11 @@ ...@@ -57,6 +57,11 @@
#include "ui/gl/gl_implementation.h" #include "ui/gl/gl_implementation.h"
#include "ui/gl/gl_switches.h" #include "ui/gl/gl_switches.h"
#if defined(OS_MACOSX)
#include "ui/events/test/event_generator.h"
#include "ui/views/test/event_generator_delegate_mac.h"
#endif
#if defined(OS_POSIX) #if defined(OS_POSIX)
#include "base/process/process_handle.h" #include "base/process/process_handle.h"
#endif #endif
...@@ -148,6 +153,9 @@ BrowserTestBase::BrowserTestBase() ...@@ -148,6 +153,9 @@ BrowserTestBase::BrowserTestBase()
#if defined(USE_AURA) #if defined(USE_AURA)
ui::test::EventGeneratorDelegate::SetFactoryFunction(base::BindRepeating( ui::test::EventGeneratorDelegate::SetFactoryFunction(base::BindRepeating(
&aura::test::EventGeneratorDelegateAura::Create, nullptr)); &aura::test::EventGeneratorDelegateAura::Create, nullptr));
#elif defined(OS_MACOSX)
ui::test::EventGeneratorDelegate::SetFactoryFunction(
base::BindRepeating(&views::test::CreateEventGeneratorDelegateMac));
#endif #endif
} }
...@@ -338,7 +346,7 @@ void BrowserTestBase::SetUp() { ...@@ -338,7 +346,7 @@ void BrowserTestBase::SetUp() {
} }
void BrowserTestBase::TearDown() { void BrowserTestBase::TearDown() {
#if defined(USE_AURA) #if defined(USE_AURA) || defined(OS_MACOSX)
ui::test::EventGeneratorDelegate::SetFactoryFunction( ui::test::EventGeneratorDelegate::SetFactoryFunction(
ui::test::EventGeneratorDelegate::FactoryFunction()); ui::test::EventGeneratorDelegate::FactoryFunction());
#endif #endif
......
...@@ -467,6 +467,10 @@ jumbo_static_library("test_support") { ...@@ -467,6 +467,10 @@ jumbo_static_library("test_support") {
] ]
} }
if (is_mac) {
deps += [ "//ui/views:test_support" ]
}
if (use_ozone) { if (use_ozone) {
deps += [ "//ui/ozone" ] deps += [ "//ui/ozone" ]
} }
......
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