X11 and Ozone: Raise on click shouldn't handled for Linux win managers.

Atm, that case is only handled for !defined(USE_X11). Instead, it must
be handled for !defined(OS_LINUX) as OS_LINUX can mean either
USE_X11 or USE_OZONE now.

Bug: 789065, 578890
Change-Id: I95d140cb515e833e5b195b1e746671db2cb57b3a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2336600Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Maksim Sisov (GMT+3) <msisov@igalia.com>
Cr-Commit-Position: refs/heads/master@{#796349}

content/browser/web_contents/web_contents_view_aura.cc

@@ -1211,7 +1211,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* event) {
     // Linux window managers like to handle raise-on-click themselves.  If we
     // raise-on-click manually, this may override user settings that prevent
     // focus-stealing.
-#if !defined(USE_X11)
+#if !defined(OS_LINUX)
     // It is possible for the web-contents to be destroyed while it is being
     // activated. Use a weak-ptr to track whether that happened or not.
     // More in https://crbug.com/1040725

content/browser/web_contents/web_contents_view_aura_unittest.cc

@@ -186,17 +186,11 @@ TEST_F(WebContentsViewAuraTest, WebContentsDestroyedDuringClick) {
                              0);
   ui::EventHandler* event_handler = GetView();
   event_handler->OnMouseEvent(&mouse_event);
-#if defined(USE_X11)
-  // The web-content is not activated during mouse-press on X11.
+#if defined(OS_LINUX)
+  // The web-content is not activated during mouse-press on Linux.
   // See comment in WebContentsViewAura::OnMouseEvent() for more details.
-  // TODO(https://crbug.com/1109695): enable for Ozone/Linux.
-  if (!features::IsUsingOzonePlatform()) {
-    EXPECT_NE(web_contents(), nullptr);
-  } else
+  EXPECT_NE(web_contents(), nullptr);
 #endif
-  {
-    EXPECT_EQ(web_contents(), nullptr);
-  }
 }
 
 TEST_F(WebContentsViewAuraTest, OccludeView) {
@@ -319,6 +313,7 @@ TEST_F(WebContentsViewAuraTest, DragDropFiles) {
 #if defined(OS_WIN) || defined(USE_X11)
 TEST_F(WebContentsViewAuraTest, DragDropFilesOriginateFromRenderer) {
 #if defined(USE_X11)
+  // TODO(https://crbug.com/1109695): enable for Ozone/Linux.
   if (features::IsUsingOzonePlatform())
     return;
 #endif