Change Ozone X11 PlatformEventSource initialization.

ui/ozone/platform/x11/ozone_platform_x11.cc

 // Copyright 2016 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/x11/ozone_platform_x11.h"
 
 #include <X11/Xlib.h>
 
 #include <memory>
 #include <utility>
@@ skipping 68 matching lines @@
     return std::move(window);
   }
 
   std::unique_ptr<display::NativeDisplayDelegate> CreateNativeDisplayDelegate()
       override {
     return base::MakeUnique<display::FakeDisplayDelegate>();
   }
 
   void InitializeUI(const InitParams& params) override {
     InitializeCommon(params);
-    window_manager_.reset(new X11WindowManagerOzone);
-    overlay_manager_.reset(new StubOverlayManager());
+    CreatePlatformEventSource();
+    window_manager_ = base::MakeUnique<X11WindowManagerOzone>();
+    overlay_manager_ = base::MakeUnique<StubOverlayManager>();
     input_controller_ = CreateStubInputController();
-    cursor_factory_ozone_.reset(new X11CursorFactoryOzone());
+    cursor_factory_ozone_ = base::MakeUnique<X11CursorFactoryOzone>();
     gpu_platform_support_host_.reset(CreateStubGpuPlatformSupportHost());
   }
 
   void InitializeUI() override { NOTREACHED(); }
 
   void InitializeGPU(const InitParams& params) override {
     InitializeCommon(params);
-    surface_factory_ozone_.reset(new X11SurfaceFactory());
+
+    // In single process mode either the UI thread will create an event source
+    // or it's a test and an event source isn't desired.
+    if (!params.single_process && !RunningInsideMus())
+      CreatePlatformEventSource();
+
+    surface_factory_ozone_ = base::MakeUnique<X11SurfaceFactory>();
   }
 
   void InitializeGPU() override { NOTREACHED(); }
 
   base::MessageLoop::Type GetMessageLoopTypeForGpu() override {
     // When Ozone X11 backend is running use an UI loop to grab Expose events.
     // See GLSurfaceGLX and https://crbug.com/326995.
     return base::MessageLoop::TYPE_UI;
   }
 
  private:
   // Performs initialization steps need by both UI and GPU.
   void InitializeCommon(const InitParams& params) {
     // TODO(kylechar): Add DCHECK we only enter InitializeCommon() twice for
     // single process mode.
     if (common_initialized_)
       return;
 
-    // If both UI and GPU are running in the same process then XInitThreads()
-    // must be the first Xlib call.
+    // In single process mode XInitThreads() must be the first Xlib call.
     if (params.single_process || RunningInsideMus())
       XInitThreads();
 
     ui::SetDefaultX11ErrorHandlers();
-    event_source_.reset(new X11EventSourceLibevent(gfx::GetXDisplay()));
 
     common_initialized_ = true;
   }
 
+  // Creates |event_source_| if it doesn't already exist.
+  void CreatePlatformEventSource() {
+    if (event_source_)
+      return;
+
+    XDisplay* display = gfx::GetXDisplay();
+    event_source_ = base::MakeUnique<X11EventSourceLibevent>(display);
+  }
+
   bool common_initialized_ = false;
 
   // Objects in the UI process.
   std::unique_ptr<X11WindowManagerOzone> window_manager_;
   std::unique_ptr<OverlayManagerOzone> overlay_manager_;
   std::unique_ptr<InputController> input_controller_;
   std::unique_ptr<X11CursorFactoryOzone> cursor_factory_ozone_;
   std::unique_ptr<GpuPlatformSupportHost> gpu_platform_support_host_;
 
   // Objects in the GPU process.
   std::unique_ptr<X11SurfaceFactory> surface_factory_ozone_;
 
   // Objects in both UI and GPU process.
   std::unique_ptr<X11EventSourceLibevent> event_source_;
 
   DISALLOW_COPY_AND_ASSIGN(OzonePlatformX11);
 };
 
 }  // namespace
 
 OzonePlatform* CreateOzonePlatformX11() {
   return new OzonePlatformX11;
 }
 
 }  // namespace ui