exo: Run exo in mus+ash

chrome/browser/chrome_browser_main_extra_parts_exo.cc

 // Copyright 2015 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 "chrome/browser/chrome_browser_main_extra_parts_exo.h"
 
 #include "base/memory/ptr_util.h"
 
 #if defined(USE_GLIB)
 #include <glib.h>
@@ skipping 92 matching lines @@
   void OnFileCanWriteWithoutBlocking(int fd) override { NOTREACHED(); }
 
  private:
   base::MessagePumpLibevent::FileDescriptorWatcher controller_;
   exo::wayland::Server* const server_;
 
   DISALLOW_COPY_AND_ASSIGN(WaylandWatcher);
 };
 #endif
 
-ChromeBrowserMainExtraPartsExo::ChromeBrowserMainExtraPartsExo()
-    : arc_notification_surface_manager_(new arc::ArcNotificationSurfaceManager),
-      display_(new exo::Display(arc_notification_surface_manager_.get())) {}
+ChromeBrowserMainExtraPartsExo::ChromeBrowserMainExtraPartsExo() {}
 
 ChromeBrowserMainExtraPartsExo::~ChromeBrowserMainExtraPartsExo() {}
 
 void ChromeBrowserMainExtraPartsExo::PreProfileInit() {
-  if (!chrome::ShouldOpenAshOnStartup())
+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableWaylandServer))
     return;
 
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableWaylandServer)) {
-    wayland_server_ = exo::wayland::Server::Create(display_.get());
-    wayland_watcher_ =
-        base::WrapUnique(new WaylandWatcher(wayland_server_.get()));
-  }
+  arc_notification_surface_manager_ =
+      base::MakeUnique<arc::ArcNotificationSurfaceManager>();
+  const bool using_mus = !chrome::ShouldOpenAshOnStartup();
+  display_ = base::MakeUnique<exo::Display>(
+      using_mus, arc_notification_surface_manager_.get());
+  wayland_server_ = exo::wayland::Server::Create(display_.get());
+  wayland_watcher_ = base::MakeUnique<WaylandWatcher>(wayland_server_.get());
 }
 
 void ChromeBrowserMainExtraPartsExo::PostMainMessageLoopRun() {
   wayland_watcher_.reset();
   wayland_server_.reset();
 }