X11 and Ozone: cleanup //chrome for use_x11 && use_ozone build.

Removes unnecessary defines, chooses correct path based on
OzonePlatform feature usage.

-----

PS: Please note that this is a temp solution that will help to choose
between ozone and non-ozone X11 build. The switch that will be used
to choose the path is --enable-features=UseOzonePlatform. Once
non-Ozone X11 path is removed (hopefully by Q1 2021 depending on how
th finch trial goes), the wrapper will be removed.

Please also note that it's impossible to build use_x11 && use_ozone
without some hacks in PlatformCursor code. The changes to that are
on their way to upstream.

----

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

chrome/browser/media/webrtc/native_desktop_media_list_unittest.cc

@@ -211,8 +211,6 @@ class NativeDesktopMediaListTest : public ChromeViewsTestBase {
     gfx::AcceleratedWidget widget = host->GetAcceleratedWidget();
 #if defined(OS_WIN)
     window.id = reinterpret_cast<DesktopMediaID::Id>(widget);
-#elif defined(USE_X11)
-    window.id = static_cast<uint32_t>(widget);
 #else
     window.id = widget;
 #endif
@@ -234,8 +232,6 @@ class NativeDesktopMediaListTest : public ChromeViewsTestBase {
         aura_window->GetHost()->GetAcceleratedWidget();
 #if defined(OS_WIN)
     int native_id = reinterpret_cast<DesktopMediaID::Id>(widget);
-#elif defined(USE_X11)
-    int native_id = static_cast<uint32_t>(widget);
 #else
     int native_id = widget;
 #endif

chrome/browser/site_isolation/site_per_process_interactive_browsertest.cc

@@ -48,6 +48,7 @@
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "ui/base/test/ui_controls.h"
+#include "ui/base/ui_base_features.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/point.h"
@@ -419,12 +420,17 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessInteractiveBrowserTest,
   EXPECT_EQ(main_frame, web_contents->GetFocusedFrame());
 }
 
-#if (defined(OS_LINUX) && !defined(USE_OZONE)) || defined(OS_WIN)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_WIN)
 // Ensures that renderers know to advance focus to sibling frames and parent
 // frames in the presence of mouse click initiated focus changes.
 // Verifies against regression of https://crbug.com/702330
 IN_PROC_BROWSER_TEST_F(SitePerProcessInteractiveBrowserTest,
                        TabAndMouseFocusNavigation) {
+#if defined(USE_OZONE)
+  // TODO(https://crbug.com/1109696): enable for ozone.
+  if (!features::IsUsingOzonePlatform())
+    return;
+#endif
   GURL main_url(embedded_test_server()->GetURL(
       "a.com", "/cross_site_iframe_factory.html?a(b,c)"));
   ui_test_utils::NavigateToURL(browser(), main_url);

chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc

@@ -7,6 +7,7 @@
 #include "chrome/browser/themes/theme_service_aura_linux.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/views/theme_profile_key.h"
+#include "ui/base/ui_base_features.h"
 #include "ui/display/screen.h"
 #include "ui/views/linux_ui/linux_ui.h"
 
@@ -20,7 +21,6 @@
 #endif
 
 #if defined(USE_X11)
-#include "ui/base/ui_base_features.h"
 #include "ui/gfx/x/connection.h"  // nogncheck
 #if BUILDFLAG(USE_GTK)
 #include "ui/gtk/x/gtk_ui_delegate_x11.h"  // nogncheck
@@ -87,7 +87,8 @@ void ChromeBrowserMainExtraPartsViewsLinux::ToolkitInitialized() {
   linux_ui->Initialize();
 
 #if defined(USE_OZONE)
-  ui::CursorFactory::GetInstance()->ObserveThemeChanges();
+  if (features::IsUsingOzonePlatform())
+    ui::CursorFactory::GetInstance()->ObserveThemeChanges();
 #endif
 
   DCHECK(ui::LinuxInputMethodContextFactory::instance())

chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.cc

@@ -24,12 +24,13 @@ namespace {
 #if defined(USE_DBUS_MENU)
 bool CreateGlobalMenuBar() {
 #if defined(USE_OZONE)
-  return ui::OzonePlatform::GetInstance()
-      ->GetPlatformProperties()
-      .supports_global_application_menus;
-#else
-  return true;
+  if (features::IsUsingOzonePlatform()) {
+    return ui::OzonePlatform::GetInstance()
+        ->GetPlatformProperties()
+        .supports_global_application_menus;
+  }
 #endif
+  return true;
 }
 #endif
 

chrome/browser/ui/views/test/view_event_test_base.cc

@@ -19,12 +19,11 @@
 
 #if defined(USE_AURA) && !defined(OS_CHROMEOS)
 #include "ui/display/screen.h"
+#include "ui/views/widget/desktop_aura/desktop_screen.h"
 
 #if defined(USE_X11)
 #include "ui/views/test/test_desktop_screen_x11.h"
-#else
-#include "ui/views/widget/desktop_aura/desktop_screen.h"
-#endif
+#endif  // defined(USE_X11)
 #endif
 
 namespace {
@@ -97,9 +96,9 @@ ViewEventTestBase::ViewEventTestBase() {
 #if defined(USE_X11)
   if (!features::IsUsingOzonePlatform())
     views::test::TestDesktopScreenX11::GetInstance();
-#else
-  screen_.reset(views::CreateDesktopScreen());
-#endif
+#endif  // defined(USE_X11)
+  if (!display::Screen::GetScreen())
+    screen_.reset(views::CreateDesktopScreen());
 #endif
 }
 

chrome/browser/ui/views/test/view_event_test_base.h

@@ -21,7 +21,7 @@
 #include "build/build_config.h"
 #include "chrome/test/views/chrome_views_test_base.h"
 
-#if defined(USE_AURA) && !defined(OS_CHROMEOS) && !defined(USE_X11)
+#if defined(USE_AURA) && !defined(OS_CHROMEOS)
 namespace display {
 class Screen;
 }
@@ -122,7 +122,7 @@ class ViewEventTestBase : public ChromeViewsTestBase {
   // failures invokes Done.
   void RunTestMethod(base::OnceClosure task);
 
-#if defined(USE_AURA) && !defined(OS_CHROMEOS) && !defined(USE_X11)
+#if defined(USE_AURA) && !defined(OS_CHROMEOS)
   std::unique_ptr<display::Screen> screen_;
 #endif
 

chrome/test/BUILD.gn

@@ -5758,6 +5758,7 @@ if (!is_android) {
       "//extensions/buildflags",
       "//skia",
       "//testing/gtest",
+      "//ui/base:features",
     ]
 
     if (enable_plugins) {

chrome/test/DEPS

@@ -83,4 +83,5 @@ include_rules = [
   "+sandbox/win/tests",
   "+third_party/webrtc",
   "+third_party/re2",
+  "+ui/base",
 ]

chrome/test/base/in_process_browser_test.cc

@@ -71,6 +71,7 @@
 #include "content/public/test/test_navigation_observer.h"
 #include "extensions/buildflags/buildflags.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
+#include "ui/base/ui_base_features.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
@@ -418,9 +419,11 @@ bool InProcessBrowserTest::SetUpUserDataDirectory() {
 
 void InProcessBrowserTest::SetScreenInstance() {
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
-  DCHECK(!display::Screen::GetScreen());
-  display::Screen::SetScreenInstance(
-      views::test::TestDesktopScreenX11::GetInstance());
+  if (!features::IsUsingOzonePlatform()) {
+    DCHECK(!display::Screen::GetScreen());
+    display::Screen::SetScreenInstance(
+        views::test::TestDesktopScreenX11::GetInstance());
+  }
 #endif
 }