From c8ef1d0bc63aa014ba0fb94049671b371c0d5d18 Mon Sep 17 00:00:00 2001 From: "sadrul@chromium.org" Date: Mon, 14 Apr 2014 21:13:20 +0000 Subject: x11: Remove X11 message-pump. The remaining use of the X11 mesage-pump was opening the connection to the X11 server. This patch moves that out of the message-pump, into gfx. This allows us to remove the X11 message-pump, and just use the base Glib-based message-pump on Linux and ChromeOS. BUG=354062 R=darin@chromium.org, sky@chromium.org Review URL: https://codereview.chromium.org/235043005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263726 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/test/ash_test_base.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ash/test') diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc index 49f1d08..61fa218 100644 --- a/ash/test/ash_test_base.cc +++ b/ash/test/ash_test_base.cc @@ -49,7 +49,7 @@ #endif #if defined(USE_X11) -#include +#include "ui/gfx/x/x11_connection.h" #endif namespace ash { @@ -98,7 +98,7 @@ AshTestBase::AshTestBase() // This is needed for tests which use this base class but are run in browser // test binaries so don't get the default initialization in the unit test // suite. - XInitThreads(); + gfx::InitializeThreadedX11(); #endif thread_bundle_.reset(new content::TestBrowserThreadBundle); -- cgit v1.1