Fix and enable OmniboxPopupContentsViewTest.ClickOmnibox

Bug: 814675
Change-Id: I522890e1252535832aed187e7add7034f46fb30c
Reviewed-on: https://chromium-review.googlesource.com/c/1311800
Commit-Queue: Evan Stade <estade@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#604726}

chrome/browser/ui/views/omnibox/omnibox_popup_contents_view_browsertest.cc

@@ -25,6 +25,7 @@
 #include "components/omnibox/browser/omnibox_field_trial.h"
 #include "components/omnibox/browser/omnibox_popup_model.h"
 #include "content/public/test/test_utils.h"
+#include "ui/base/ui_base_features.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/views/widget/widget.h"
@@ -251,7 +252,13 @@ IN_PROC_BROWSER_TEST_F(OmniboxPopupContentsViewTest, MAYBE_ThemeIntegration) {
 // Test that clicks over the omnibox do not hit the popup.
 IN_PROC_BROWSER_TEST_F(OmniboxPopupContentsViewTest, MAYBE_ClickOmnibox) {
   CreatePopupForTestQuery();
-  ui::test::EventGenerator generator(browser()->window()->GetNativeWindow());
+
+  gfx::NativeWindow event_window = browser()->window()->GetNativeWindow();
+#if defined(OS_CHROMEOS)
+  if (features::IsUsingWindowService())
+    event_window = nullptr;
+#endif
+  ui::test::EventGenerator generator(event_window);
 
   OmniboxResultView* result = GetResultViewAt(0);
   ASSERT_TRUE(result);

testing/buildbot/filters/chromeos.mash.fyi.browser_tests.filter

@@ -227,9 +227,6 @@
 -PowerPolicyLoginScreenBrowserTest.SetDevicePolicy
 -EnterpriseEnrollmentTest.TestActiveDirectoryEnrollment_Success
 
-# Needs EventGenerator to work across window tree hosts. crbug.com/814675
--OmniboxPopupContentsViewTest.ClickOmnibox
-
 # HostedAppMenu needs porting to BrowserNonClientFrameViewMash crbug.com/813666
 -HostedAppPWAOnlyTest.AppInfoOpensPageInfo*
 

testing/buildbot/filters/chromeos.single_process_mash.browser_tests.filter

@@ -37,9 +37,6 @@
 # JS failure: hasAccessToCurrentWindow: FAIL (no message)
 -LockScreenNoteTakingTest.*
 
-# Needs EventGenerator to work across window tree hosts. crbug.com/814675
--OmniboxPopupContentsViewTest.ClickOmnibox
-
 # --------------------------------------------------
 # Tests failing only for SingleProcessMash.
 # --------------------------------------------------