Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(378)

Unified Diff: trunk/src/ash/test/ash_test_base.cc

Issue 238093002: Revert 263726 "x11: Remove X11 message-pump." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/ash/shell.cc ('k') | trunk/src/ash/wm/ash_native_cursor_manager_interactive_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ash/test/ash_test_base.cc
===================================================================
--- trunk/src/ash/test/ash_test_base.cc (revision 263732)
+++ trunk/src/ash/test/ash_test_base.cc (working copy)
@@ -49,7 +49,7 @@
#endif
#if defined(USE_X11)
-#include "ui/gfx/x/x11_connection.h"
+#include <X11/Xlib.h>
#endif
namespace ash {
@@ -98,7 +98,7 @@
// 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.
- gfx::InitializeThreadedX11();
+ XInitThreads();
#endif
thread_bundle_.reset(new content::TestBrowserThreadBundle);
« no previous file with comments | « trunk/src/ash/shell.cc ('k') | trunk/src/ash/wm/ash_native_cursor_manager_interactive_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698