Making CursorFactoryOzone thread-local

ui/base/cursor/cursor_loader_ozone.h

Index: ui/base/cursor/cursor_loader_ozone.h
diff --git a/ui/base/cursor/cursor_loader_ozone.h b/ui/base/cursor/cursor_loader_ozone.h
index 00a23283d5855bd4d3ae36d9d716a02693d7eb75..acb95717bd5a040a54149a6d17706185d297274b 100644
--- a/ui/base/cursor/cursor_loader_ozone.h
+++ b/ui/base/cursor/cursor_loader_ozone.h
@@ -13,8 +13,12 @@
 
 namespace ui {
 
+class CursorFactoryOzone;
+
 class UI_BASE_EXPORT CursorLoaderOzone : public CursorLoader {
  public:
+  // CursorLoaderOzone will use CursorFactoryOzone corresponding to the thread
+  // it was constructed on.
   CursorLoaderOzone();
   ~CursorLoaderOzone() override;
 
@@ -33,6 +37,7 @@ class UI_BASE_EXPORT CursorLoaderOzone : public CursorLoader {
   // Pointers are owned by ResourceBundle and must not be freed here.
   typedef std::map<CursorType, PlatformCursor> ImageCursorMap;
   ImageCursorMap cursors_;
+  CursorFactoryOzone* factory_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(CursorLoaderOzone);
 };