1 files changed, 4 insertions, 6 deletions
diff --git a/chromium/ui/ozone/platform/x11/x11_screen_ozone.cc b/chromium/ui/ozone/platform/x11/x11_screen_ozone.cc
index 5e70823134f..7b3ab857934 100644
--- a/chromium/ui/ozone/platform/x11/x11_screen_ozone.cc
+++ b/chromium/ui/ozone/platform/x11/x11_screen_ozone.cc
@@ -6,7 +6,7 @@
 
 #include "ui/base/linux/linux_desktop.h"
 #include "ui/base/x/x11_idle_query.h"
-#include "ui/base/x/x11_screensaver_window_finder.h"
+#include "ui/base/x/x11_screensaver.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/display/display_finder.h"
 #include "ui/display/util/display_util.h"
@@ -57,14 +57,14 @@ display::Display X11ScreenOzone::GetDisplayForAcceleratedWidget(
 }
 
 gfx::Point X11ScreenOzone::GetCursorScreenPoint() const {
-  base::Optional<gfx::Point> point_in_pixels;
+  absl::optional<gfx::Point> point_in_pixels;
   if (ui::X11EventSource::HasInstance()) {
     point_in_pixels = ui::X11EventSource::GetInstance()
                           ->GetRootCursorLocationFromCurrentEvent();
   }
   if (!point_in_pixels) {
     // This call is expensive so we explicitly only call it when
-    // |point_in_pixels| is not set. We note that base::Optional::value_or()
+    // |point_in_pixels| is not set. We note that absl::optional::value_or()
     // would cause it to be called regardless.
     point_in_pixels = GetCursorLocation();
   }
@@ -111,7 +111,7 @@ void X11ScreenOzone::SetScreenSaverSuspended(bool suspend) {
 
 bool X11ScreenOzone::IsScreenSaverActive() const {
   // Usually the screensaver is used to lock the screen.
-  return ScreensaverWindowFinder::ScreensaverWindowExists();
+  return IsXScreensaverActive();
 }
 
 base::TimeDelta X11ScreenOzone::CalculateIdleTime() const {
@@ -134,8 +134,6 @@ std::string X11ScreenOzone::GetCurrentWorkspace() {
 base::Value X11ScreenOzone::GetGpuExtraInfoAsListValue(
     const gfx::GpuExtraInfo& gpu_extra_info) {
   auto result = GetDesktopEnvironmentInfoAsListValue();
-  StoreGpuExtraInfoIntoListValue(gpu_extra_info.system_visual,
-                                 gpu_extra_info.rgba_visual, result);
   StorePlatformNameIntoListValue(result, "x11");
   return result;
 }