Making CursorFactoryOzone thread-local

ui/base/cursor/image_cursors.cc

Index: ui/base/cursor/image_cursors.cc
diff --git a/ui/base/cursor/image_cursors.cc b/ui/base/cursor/image_cursors.cc
index 93c25a9ae3d32f7c4b4a82167d5067b5486e5792..435fa5a06750a716e32c601800946c584c766036 100644
--- a/ui/base/cursor/image_cursors.cc
+++ b/ui/base/cursor/image_cursors.cc
@@ -60,11 +60,17 @@ const CursorType kAnimatedCursorIds[] = {CursorType::kWait,
 
 }  // namespace
 
-ImageCursors::ImageCursors() : cursor_size_(CursorSize::kNormal) {}
+ImageCursors::ImageCursors()
+    : cursor_size_(CursorSize::kNormal), weak_ptr_factory_(this) {}
 
 ImageCursors::~ImageCursors() {
 }
 
+void ImageCursors::Initialize() {
+  if (!cursor_loader_)
+    cursor_loader_.reset(CursorLoader::Create());
+}
+
 float ImageCursors::GetScale() const {
   if (!cursor_loader_) {
     NOTREACHED();
@@ -142,4 +148,8 @@ void ImageCursors::SetPlatformCursor(gfx::NativeCursor* cursor) {
   cursor_loader_->SetPlatformCursor(cursor);
 }
 
+base::WeakPtr<ImageCursors> ImageCursors::GetWeakPtr() {
+  return weak_ptr_factory_.GetWeakPtr();
+}
+
 }  // namespace ui