[Ozone-Drm] Fix Ozone initialization order

ui/ozone/platform/drm/ozone_platform_drm.cc

 // Copyright 2013 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/ozone/platform/drm/ozone_platform_drm.h"
 
 #include "base/at_exit.h"
 #include "base/thread_task_runner_handle.h"
 #include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h"
 #include "ui/events/ozone/device/device_manager.h"
@@ skipping 85 matching lines @@
     gpu_lock_.reset(new GpuLock());
 #endif
     if (!drm_->Initialize())
       LOG(FATAL) << "Failed to initialize primary DRM device";
 
     // This makes sure that simple targets that do not handle display
     // configuration can still use the primary display.
     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_));
     scoped_ptr<DrmGpuDisplayManager> ndd(new DrmGpuDisplayManager(
         screen_manager_.get(), drm_,
         scoped_ptr<DrmDeviceGenerator>(new DrmDeviceGenerator())));
     gpu_platform_support_.reset(new DrmGpuPlatformSupport(
         drm_device_manager_.get(), &window_delegate_manager_,
         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(
         new XkbKeyboardLayoutEngine(xkb_evdev_code_converter_)));
 #else
     KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(
         make_scoped_ptr(new StubKeyboardLayoutEngine()));
 #endif
     event_factory_ozone_.reset(new EventFactoryEvdev(
         cursor_.get(), device_manager_.get(),
@@ skipping 12 matching lines @@
   scoped_refptr<DrmDevice> drm_;
   scoped_ptr<DrmDeviceManager> drm_device_manager_;
   scoped_ptr<DrmBufferGenerator> buffer_generator_;
   scoped_ptr<ScreenManager> screen_manager_;
   scoped_ptr<DrmGpuPlatformSupport> gpu_platform_support_;
   DrmWindowManager window_delegate_manager_;
 
   // 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_;
 
 #if defined(USE_XKBCOMMON)
   XkbEvdevCodes xkb_evdev_code_converter_;
 #endif
 
   // Objects on both processes.
   scoped_ptr<DrmSurfaceFactory> surface_factory_ozone_;
 
   OzoneGpuTestHelper gpu_helper_;
 
   DISALLOW_COPY_AND_ASSIGN(OzonePlatformDrm);
 };
 
 }  // namespace
 
 OzonePlatform* CreateOzonePlatformDri() {
   return new OzonePlatformDrm;
 }
 
 OzonePlatform* CreateOzonePlatformDrm() {
   return new OzonePlatformDrm;
 }
 
 }  // namespace ui