Revert of Support modal windows

athena/wm/window_manager_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "athena/wm/public/window_manager.h"
 
 #include "athena/screen/public/screen_manager.h"
 #include "athena/test/base/athena_test_base.h"
-#include "athena/test/base/test_windows.h"
 #include "athena/wm/public/window_list_provider.h"
 #include "athena/wm/split_view_controller.h"
 #include "athena/wm/test/window_manager_impl_test_api.h"
 #include "athena/wm/window_manager_impl.h"
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 #include "ui/wm/core/window_util.h"
 
 namespace athena {
 
 class WindowManagerTest : public test::AthenaTestBase {
  public:
   WindowManagerTest() {}
   virtual ~WindowManagerTest() {}
 
   scoped_ptr<aura::Window> CreateAndActivateWindow(
       aura::WindowDelegate* delegate) {
-    scoped_ptr<aura::Window> window(test::CreateNormalWindow(delegate, NULL));
+    scoped_ptr<aura::Window> window(CreateTestWindow(delegate, gfx::Rect()));
     window->Show();
     wm::ActivateWindow(window.get());
     return window.Pass();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WindowManagerTest);
 };
 
 TEST_F(WindowManagerTest, OverviewModeBasics) {
@@ skipping 343 matching lines @@
   aura::test::TestWindowDelegate delegate;
   scoped_ptr<aura::Window> w1(CreateAndActivateWindow(&delegate));
   WindowManager::Get()->EnterOverview();
 
   ui::test::EventGenerator generator(root_window());
   generator.MoveMouseTo(1, 1);
   generator.ClickLeftButton();
 }
 
 }  // namespace athena