Revert of Support modal windows

athena/test/base/athena_test_base.cc

Index: athena/test/base/athena_test_base.cc
diff --git a/athena/test/base/athena_test_base.cc b/athena/test/base/athena_test_base.cc
index 180baea7b5df4b703f0a75cab9c4e9ec64a8b173..a6f88b15a9feda5aa90dfe24a0274cbeff55ddae 100644
--- a/athena/test/base/athena_test_base.cc
+++ b/athena/test/base/athena_test_base.cc
@@ -5,8 +5,11 @@
 #include "athena/test/base/athena_test_base.h"
 
 #include "athena/env/public/athena_env.h"
+#include "athena/screen/public/screen_manager.h"
 #include "athena/test/base/athena_test_helper.h"
+#include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/test/event_generator_delegate_aura.h"
+#include "ui/aura/window.h"
 #include "ui/compositor/test/context_factories_for_test.h"
 
 #if defined(USE_X11)
@@ -62,5 +65,16 @@
   helper_->RunAllPendingInMessageLoop();
 }
 
+scoped_ptr<aura::Window> AthenaTestBase::CreateTestWindow(
+    aura::WindowDelegate* delegate,
+    const gfx::Rect& bounds) {
+  scoped_ptr<aura::Window> window(new aura::Window(delegate));
+  window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
+  window->Init(aura::WINDOW_LAYER_SOLID_COLOR);
+  aura::client::ParentWindowWithContext(
+      window.get(), ScreenManager::Get()->GetContext(), bounds);
+  return window.Pass();
+}
+
 }  // namespace test
 }  // namespace athena