Linux Aura: Fixes and improvements for cursor loader

ui/aura/test/aura_test_helper.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/aura/test/aura_test_helper.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "ui/aura/client/default_capture_client.h"
@@ skipping 119 matching lines @@
   teardown_called_ = true;
   parenting_client_.reset();
   client::SetFocusClient(root_window(), nullptr);
   client::SetCaptureClient(root_window(), nullptr);
   host_.reset();
   ui::GestureRecognizer::Reset();
   if (display::Screen::GetScreen() == test_screen_.get())
     display::Screen::SetScreenInstance(nullptr);
   test_screen_.reset();
 
-#if defined(USE_X11)
-  ui::test::ResetXCursorCache();
-#endif
-
   Env::GetInstance()->SetActiveFocusClient(nullptr, nullptr);
   window_tree_client_setup_.reset();
   focus_client_.reset();
   capture_client_.reset();
 
   ui::ShutdownInputMethodForTesting();
 
   if (env_) {
     env_.reset();
   } else {
@@ skipping 35 matching lines @@
         base::MakeUnique<WindowPortLocal>(window);
     return std::move(window_port);
   }
   std::unique_ptr<WindowPortMus> window_port = base::MakeUnique<WindowPortMus>(
       window_tree_client_, WindowMusType::LOCAL);
   return std::move(window_port);
 }
 
 }  // namespace test
 }  // namespace aura