Index: ash/wm/ash_native_cursor_manager_interactive_uitest.cc |
=================================================================== |
--- ash/wm/ash_native_cursor_manager_interactive_uitest.cc (revision 257432) |
+++ ash/wm/ash_native_cursor_manager_interactive_uitest.cc (working copy) |
@@ -8,10 +8,14 @@ |
#include "ash/shell.h" |
#include "ash/test/ash_test_base.h" |
#include "ash/test/cursor_manager_test_api.h" |
+#include "base/path_service.h" |
#include "base/run_loop.h" |
#include "ui/aura/window.h" |
#include "ui/aura/window_event_dispatcher.h" |
+#include "ui/base/resource/resource_bundle.h" |
#include "ui/base/test/ui_controls.h" |
+#include "ui/base/ui_base_paths.h" |
+#include "ui/gl/gl_surface.h" |
#if defined(USE_X11) |
#include <X11/Xlib.h> |
@@ -22,8 +26,28 @@ |
namespace ash { |
using ::wm::CursorManager; |
-typedef test::AshTestBase AshNativeCursorManagerTest; |
+class AshNativeCursorManagerTest : public test::AshTestBase { |
+ public: |
+ AshNativeCursorManagerTest() {} |
+ virtual ~AshNativeCursorManagerTest() {} |
+ |
+ virtual void SetUp() OVERRIDE { |
+ gfx::GLSurface::InitializeOneOffForTests(); |
+ |
+ ui::RegisterPathProvider(); |
+ ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); |
+ base::FilePath resources_pack_path; |
+ PathService::Get(base::DIR_MODULE, &resources_pack_path); |
+ resources_pack_path = |
+ resources_pack_path.Append(FILE_PATH_LITERAL("resources.pak")); |
+ ResourceBundle::GetSharedInstance().AddDataPackFromPath( |
+ resources_pack_path, ui::SCALE_FACTOR_NONE); |
+ |
+ test::AshTestBase::SetUp(); |
+ } |
+}; |
+ |
namespace { |
internal::DisplayInfo CreateDisplayInfo(int64 id, |