BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

2 files changed, 6 insertions, 6 deletions

diff --git a/chromium/ui/ozone/platform/windows/BUILD.gn b/chromium/ui/ozone/platform/windows/BUILD.gn
index 766c32795be..72fb3aae39a 100644
--- a/chromium/ui/ozone/platform/windows/BUILD.gn
+++ b/chromium/ui/ozone/platform/windows/BUILD.gn
@@ -24,6 +24,8 @@ source_set("windows") {
     "//base",
     "//skia",
     "//ui/base",
+    "//ui/base/cursor",
+    "//ui/base/cursor:cursor_base",
     "//ui/display/fake",
     "//ui/events",
     "//ui/events/ozone/layout",
diff --git a/chromium/ui/ozone/platform/windows/ozone_platform_windows.cc b/chromium/ui/ozone/platform/windows/ozone_platform_windows.cc
index d6dee8a511c..5a686f01622 100644
--- a/chromium/ui/ozone/platform/windows/ozone_platform_windows.cc
+++ b/chromium/ui/ozone/platform/windows/ozone_platform_windows.cc
@@ -10,6 +10,7 @@
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
+#include "ui/base/cursor/cursor_factory.h"
 #include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h"
 #include "ui/display/fake/fake_display_delegate.h"
 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
@@ -20,7 +21,6 @@
 #include "ui/ozone/platform/windows/windows_surface_factory.h"
 #include "ui/ozone/platform/windows/windows_window.h"
 #include "ui/ozone/platform/windows/windows_window_manager.h"
-#include "ui/ozone/public/cursor_factory_ozone.h"
 #include "ui/ozone/public/gpu_platform_support_host.h"
 #include "ui/ozone/public/input_controller.h"
 #include "ui/ozone/public/ozone_platform.h"
@@ -56,9 +56,7 @@ class OzonePlatformWindows : public OzonePlatform {
   OverlayManagerOzone* GetOverlayManager() override {
     return overlay_manager_.get();
   }
-  CursorFactoryOzone* GetCursorFactoryOzone() override {
-    return cursor_factory_ozone_.get();
-  }
+  CursorFactory* GetCursorFactory() override { return cursor_factory_.get(); }
   InputController* GetInputController() override {
     return input_controller_.get();
   }
@@ -96,7 +94,7 @@ class OzonePlatformWindows : public OzonePlatform {
 
     overlay_manager_ = std::make_unique<StubOverlayManager>();
     input_controller_ = CreateStubInputController();
-    cursor_factory_ozone_ = std::make_unique<BitmapCursorFactoryOzone>();
+    cursor_factory_ = std::make_unique<BitmapCursorFactory>();
     gpu_platform_support_host_.reset(CreateStubGpuPlatformSupportHost());
   }
 
@@ -110,7 +108,7 @@ class OzonePlatformWindows : public OzonePlatform {
   std::unique_ptr<WindowsWindowManager> window_manager_;
   std::unique_ptr<WindowsSurfaceFactory> surface_factory_;
   std::unique_ptr<PlatformEventSource> platform_event_source_;
-  std::unique_ptr<CursorFactoryOzone> cursor_factory_ozone_;
+  std::unique_ptr<CursorFactory> cursor_factory_;
   std::unique_ptr<InputController> input_controller_;
   std::unique_ptr<GpuPlatformSupportHost> gpu_platform_support_host_;
   std::unique_ptr<OverlayManagerOzone> overlay_manager_;