| Index: content/renderer/render_view_browsertest.cc
|
| diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
|
| index 33e511ab1af939a440ccd5478b851b88154ccef1..e61ba443bf0c56b3616ced55b92616805e45cc51 100644
|
| --- a/content/renderer/render_view_browsertest.cc
|
| +++ b/content/renderer/render_view_browsertest.cc
|
| @@ -96,6 +96,7 @@
|
|
|
| #if defined(USE_AURA) && defined(USE_X11)
|
| #include <X11/Xlib.h>
|
| +#undef None // Defined by X11/X.h to 0L which collides with other headers
|
| #include "base/memory/ptr_util.h"
|
| #include "ui/events/event_constants.h"
|
| #include "ui/events/keycodes/keyboard_code_conversion.h"
|
|
|