Revert of Support modal windows

athena/activity/activity_manager_unittest.cc

Index: athena/activity/activity_manager_unittest.cc
diff --git a/athena/activity/activity_manager_unittest.cc b/athena/activity/activity_manager_unittest.cc
index 37f73f6bfc099661add28f4074a8148bfbd0b996..0ed2a9ab0dfb2605033de6bcc9c8a3afa2a7c04b 100644
--- a/athena/activity/activity_manager_unittest.cc
+++ b/athena/activity/activity_manager_unittest.cc
@@ -7,7 +7,6 @@
 #include "athena/activity/public/activity.h"
 #include "athena/activity/public/activity_factory.h"
 #include "athena/test/base/athena_test_base.h"
-#include "athena/test/base/test_windows.h"
 #include "ui/aura/window.h"
 
 namespace athena {
@@ -54,7 +53,7 @@
 
   EXPECT_EQ(NULL, manager->GetActivityForWindow(NULL));
 
-  scoped_ptr<aura::Window> window = test::CreateNormalWindow(NULL, NULL);
+  scoped_ptr<aura::Window> window = CreateTestWindow(NULL, gfx::Rect());
   EXPECT_EQ(NULL, manager->GetActivityForWindow(window.get()));
 }