Revert "Enable ATK and Glib on Linux/Ozone"

This reverts commit 16c153e6.

Reason for revert:

Findit (https://goo.gl/kROfz5) identified CL at revision 742233 as the
culprit for failures in the build cycles as shown on:
https://analysis.chromium.org/waterfall/culprit?key=ag9zfmZpbmRpdC1mb3ItbWVyRAsSDVdmU3VzcGVjdGVkQ0wiMWNocm9taXVtLzE2YzE1M2U2ZWUzMzYxMjE2NThjMDA3ZGMzYjJjZGQ3MDZiMmYzN2UM

Sample Failed Build: https://ci.chromium.org/b/8888089659985838672

Sample Failed Step: compile

Original change's description:
> Enable ATK and Glib on Linux/Ozone
> 
> BUG=988094,1014934
> R=sky
> CC=nickdiego,msisov,adunaev
> 
> Change-Id: I05b4bae5ccce53053ad4ae8269db849c2db9e569
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2056570
> Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org>
> Reviewed-by: Nick Yamane <nickdiego@igalia.com>
> Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#742233}


No-Presubmit: true
No-Tree-Checks: true
No-Try: true
BUG=988094,1014934

Change-Id: If3f5a60b81a9e80ba326f3fdddef15dad08d8628
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2062760
Cr-Commit-Position: refs/heads/master@{#742241}

build/config/ui.gni

@@ -21,7 +21,8 @@ import("//build/config/chromecast_build.gni")
 
 declare_args() {
   # Indicates if Ozone is enabled. Ozone is a low-level library layer for Linux
-  # that does not require X11. Enabling this feature disables use of x11.
+  # that does not require X11. Enabling this feature disables use of glib, x11,
+  # Pango, and Cairo.
   use_ozone = is_chromeos || (is_chromecast && !is_android) || is_fuchsia
 
   # Indicates if Aura is enabled. Aura is a low-level windowing library, sort
@@ -34,7 +35,7 @@ declare_args() {
   toolkit_views = is_mac || is_win || is_linux || (is_fuchsia && is_chromecast)
 
   # Whether we should use glib, a low level C utility library.
-  use_glib = is_desktop_linux && !is_chromecast
+  use_glib = is_linux && !use_ozone
 }
 
 # Additional dependent variables -----------------------------------------------
@@ -48,7 +49,7 @@ use_x11 = is_linux && !use_ozone
 assert(!use_glib || (is_linux && !is_chromeos && !is_chromecast))
 
 # Whether to use atk, the Accessibility ToolKit library
-use_atk = is_desktop_linux && !is_chromecast
+use_atk = is_desktop_linux && use_x11
 # =============================================
 #   PLEASE DO NOT ADD MORE FLAGS TO THIS FILE
 # =============================================

ui/accessibility/platform/atk_util_auralinux.cc

@@ -145,4 +145,11 @@ DiscardAtkKeyEvent AtkUtilAuraLinux::HandleAtkKeyEvent(
   return discard ? DiscardAtkKeyEvent::Discard : DiscardAtkKeyEvent::Retain;
 }
 
+#if !defined(USE_X11)
+DiscardAtkKeyEvent AtkUtilAuraLinux::HandleKeyEvent(
+    const ui::KeyEvent& ui_key_event) {
+  NOTREACHED();
+}
+#endif
+
 }  // namespace ui

ui/gfx/BUILD.gn

@@ -470,7 +470,6 @@ source_set("native_widget_types") {
   public_deps = [
     ":gfx_export",
     "//base",
-    "//ui/base:buildflags",
   ]
 }
 

ui/gfx/DEPS

@@ -6,7 +6,6 @@ include_rules = [
   "+skia/ext",
   "+third_party/harfbuzz-ng",
   "+third_party/skia",
-  "+ui/base/buildflags.h",
   "+ui/ios",
 
   "-testing/gmock",

ui/gfx/native_widget_types.h

@@ -9,7 +9,6 @@
 
 #include "base/logging.h"
 #include "build/build_config.h"
-#include "ui/base/buildflags.h"
 #include "ui/gfx/gfx_export.h"
 
 #if defined(OS_ANDROID)
@@ -103,7 +102,7 @@ class ViewAndroid;
 #endif
 class SkBitmap;
 
-#if BUILDFLAG(USE_ATK)
+#if defined(USE_X11)
 extern "C" {
 struct _AtkObject;
 typedef struct _AtkObject AtkObject;
@@ -206,7 +205,7 @@ typedef NSFont* NativeFont;
 typedef id NativeViewAccessible;
 #else  // Android, Linux, Chrome OS, etc.
 // Linux doesn't have a native font type.
-#if BUILDFLAG(USE_ATK)
+#if defined(USE_X11)
 typedef AtkObject* NativeViewAccessible;
 #else
 typedef struct _UnimplementedNativeViewAccessible

ui/views/BUILD.gn

@@ -772,6 +772,13 @@ jumbo_component("views") {
           "widget/desktop_aura/x11_topmost_window_finder.cc",
           "widget/desktop_aura/x11_whole_screen_move_loop.cc",
         ]
+        if (use_atk) {
+          sources += [
+            "accessibility/view_ax_platform_node_delegate_auralinux.cc",
+            "accessibility/view_ax_platform_node_delegate_auralinux.h",
+          ]
+          configs += [ "//build/config/linux/atk" ]
+        }
       } else if (is_win) {
         public += [ "widget/desktop_aura/desktop_window_tree_host_win.h" ]
         sources += [
@@ -809,13 +816,6 @@ jumbo_component("views") {
             [ "widget/desktop_aura/desktop_window_tree_host_platform.cc" ]
         deps += [ "//ui/platform_window/extensions" ]
       }
-      if (use_atk) {
-        sources += [
-          "accessibility/view_ax_platform_node_delegate_auralinux.cc",
-          "accessibility/view_ax_platform_node_delegate_auralinux.h",
-        ]
-        configs += [ "//build/config/linux/atk" ]
-      }
     }
   }