Converts test_wm to use aura

services/ui/service.cc

Index: services/ui/service.cc
diff --git a/services/ui/service.cc b/services/ui/service.cc
index 440df5eb22db31d08f120db203e8eabf86689027..03de291e3202bb128d8c74cfbab6d060eae824f0 100644
--- a/services/ui/service.cc
+++ b/services/ui/service.cc
@@ -49,6 +49,7 @@
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
+#include "ui/base/x/x11_util.h"  // nogncheck
 #include "ui/platform_window/x11/x11_window.h"
 #elif defined(USE_OZONE)
 #include "ui/events/ozone/layout/keyboard_layout_engine.h"
@@ -149,6 +150,7 @@ void Service::OnStart() {
   XInitThreads();
   if (test_config_)
     ui::test::SetUseOverrideRedirectWindowByDefault(true);
+  ui::SetDefaultX11ErrorHandlers();

[sadrul, 2016/11/23 06:19:53]

I don't think this has an effect on ozone builds.

[sky, 2016/11/23 16:22:11]

It doesn't. That's why it's in the USE_X11 ifdef. Or am I missing something?

[sadrul, 2016/11/23 16:27:38]

Nope. Just wanted to point out that this doesn't affect ozone-x11 either.

 #endif
 
   InitializeResources(context()->connector());