[Ozone-Drm] Fix Ozone initialization order

Need to initialize the WindowHostManager before the DrmCursor since the
DrmCursor depends on the WindowHostManager.

BUG=468485,467822

Review URL: https://codereview.chromium.org/1011533003

Cr-Commit-Position: refs/heads/master@{#322001}

ui/ozone/platform/drm/ozone_platform_drm.cc

@@ -103,6 +103,7 @@ class OzonePlatformDrm : public OzonePlatform {
     ForceInitializationOfPrimaryDisplay(drm_, screen_manager_.get());
     drm_device_manager_.reset(new DrmDeviceManager(drm_));
     display_manager_.reset(new DisplayManager());
+    window_manager_.reset(new DrmWindowHostManager());
     cursor_.reset(new DrmCursor(window_manager_.get()));
     surface_factory_ozone_.reset(
         new DrmSurfaceFactory(&window_delegate_manager_));
@@ -114,7 +115,6 @@ class OzonePlatformDrm : public OzonePlatform {
         screen_manager_.get(), ndd.Pass()));
     gpu_platform_support_host_.reset(
         new DrmGpuPlatformSupportHost(cursor_.get()));
-    window_manager_.reset(new DrmWindowHostManager());
     cursor_factory_ozone_.reset(new BitmapCursorFactoryOzone);
 #if defined(USE_XKBCOMMON)
     KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(make_scoped_ptr(
@@ -147,9 +147,9 @@ class OzonePlatformDrm : public OzonePlatform {
   // Objects in the "Browser" process.
   scoped_ptr<DeviceManager> device_manager_;
   scoped_ptr<BitmapCursorFactoryOzone> cursor_factory_ozone_;
+  scoped_ptr<DrmWindowHostManager> window_manager_;
   scoped_ptr<DrmCursor> cursor_;
   scoped_ptr<EventFactoryEvdev> event_factory_ozone_;
-  scoped_ptr<DrmWindowHostManager> window_manager_;
   scoped_ptr<DisplayManager> display_manager_;
   scoped_ptr<DrmGpuPlatformSupportHost> gpu_platform_support_host_;
 

ui/ozone/platform/drm/ozone_platform_gbm.cc

@@ -154,10 +154,10 @@ class OzonePlatformGbm : public OzonePlatform {
     if (!surface_factory_ozone_)
       surface_factory_ozone_.reset(new GbmSurfaceFactory(use_surfaceless_));
     device_manager_ = CreateDeviceManager();
+    window_manager_.reset(new DrmWindowHostManager());
     cursor_.reset(new DrmCursor(window_manager_.get()));
     gpu_platform_support_host_.reset(
         new DrmGpuPlatformSupportHost(cursor_.get()));
-    window_manager_.reset(new DrmWindowHostManager());
     cursor_factory_ozone_.reset(new BitmapCursorFactoryOzone);
 #if defined(USE_XKBCOMMON)
     KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(make_scoped_ptr(
@@ -221,10 +221,10 @@ class OzonePlatformGbm : public OzonePlatform {
   base::FilePath primary_graphics_card_path_;
   scoped_ptr<DeviceManager> device_manager_;
   scoped_ptr<BitmapCursorFactoryOzone> cursor_factory_ozone_;
+  scoped_ptr<DrmWindowHostManager> window_manager_;
   scoped_ptr<DrmCursor> cursor_;
   scoped_ptr<EventFactoryEvdev> event_factory_ozone_;
   scoped_ptr<DrmGpuPlatformSupportHost> gpu_platform_support_host_;
-  scoped_ptr<DrmWindowHostManager> window_manager_;
   scoped_ptr<DisplayManager> display_manager_;
 
 #if defined(USE_XKBCOMMON)