Athena's FocusManager

athena/test/athena_test_helper.cc

Index: athena/test/athena_test_helper.cc
diff --git a/athena/test/athena_test_helper.cc b/athena/test/athena_test_helper.cc
index 88961bad1eda8dafc5d23d12958f60bfdf2f1367..a8e06c5e5cdebee19f7dc8fa09680add835089ab 100644
--- a/athena/test/athena_test_helper.cc
+++ b/athena/test/athena_test_helper.cc
@@ -22,7 +22,6 @@
 #include "ui/wm/core/input_method_event_filter.h"
 
 #if defined(USE_X11)
-#include "ui/aura/window_tree_host_x11.h"
 #include "ui/base/x/x11_util.h"
 #endif
 
@@ -36,9 +35,6 @@ AthenaTestHelper::AthenaTestHelper(base::MessageLoopForUI* message_loop)
   // Disable animations during tests.
   zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode(
       ui::ScopedAnimationDurationScaleMode::ZERO_DURATION));
-#if defined(USE_X11)
-  aura::test::SetUseOverrideRedirectWindowByDefault(true);
-#endif
 }
 
 AthenaTestHelper::~AthenaTestHelper() {