Revert of Support modal windows

athena/wm/split_view_controller_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/split_view_controller.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/test/window_manager_impl_test_api.h"
 #include "base/memory/scoped_vector.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 #include "ui/wm/core/window_util.h"
 
 namespace athena {
@@ skipping 76 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SplitViewControllerTest);
 };
 
 // Tests that when split mode is activated, the windows on the left and right
 // are selected correctly.
 TEST_F(SplitViewControllerTest, SplitModeActivation) {
   aura::test::TestWindowDelegate delegate;
   ScopedVector<aura::Window> windows;
   const int kNumWindows = 6;
   for (size_t i = 0; i < kNumWindows; ++i) {
-    scoped_ptr<aura::Window> window = test::CreateNormalWindow(NULL, NULL);
+    scoped_ptr<aura::Window> window = CreateTestWindow(NULL, gfx::Rect());
     windows.push_back(window.release());
     windows[i]->Hide();
   }
 
   windows[kNumWindows - 1]->Show();
   wm::ActivateWindow(windows[kNumWindows - 1]);
 
   SplitViewController* controller = api()->GetSplitViewController();
   ASSERT_FALSE(controller->IsSplitViewModeActive());
 
@@ skipping 71 matching lines @@
   return window->layer()->transform().To2dTranslation().x();
 }
 
 // Tests that calls to the methods of DragHandleScrollDelegate will disengage
 // split view mode under the correct circumstances.
 TEST_F(SplitViewControllerTest, ScrollDragHandle) {
   aura::test::TestWindowDelegate delegate;
   ScopedVector<aura::Window> windows;
   const int kNumWindows = 2;
   for (size_t i = 0; i < kNumWindows; ++i) {
-    scoped_ptr<aura::Window> window = test::CreateNormalWindow(NULL, NULL);
+    scoped_ptr<aura::Window> window = CreateTestWindow(NULL, gfx::Rect());
     windows.push_back(window.release());
     windows[i]->Hide();
   }
 
   SplitViewController* controller = api()->GetSplitViewController();
   ASSERT_FALSE(controller->IsSplitViewModeActive());
 
   aura::Window* left_window = windows[0];
   aura::Window* right_window = windows[1];
   left_window->Show();
@@ skipping 75 matching lines @@
   EXPECT_EQ(NULL, controller->left_window());
   EXPECT_EQ(NULL, controller->right_window());
   EXPECT_EQ(left_window, GetTopmostWindow());
 }
 
 TEST_F(SplitViewControllerTest, LandscapeOnly) {
   aura::test::TestWindowDelegate delegate;
   ScopedVector<aura::Window> windows;
   const int kNumWindows = 2;
   for (size_t i = 0; i < kNumWindows; ++i) {
-    scoped_ptr<aura::Window> window = test::CreateNormalWindow(NULL, NULL);
+    scoped_ptr<aura::Window> window = CreateTestWindow(NULL, gfx::Rect());
     window->Hide();
     windows.push_back(window.release());
   }
   windows[kNumWindows - 1]->Show();
   wm::ActivateWindow(windows[kNumWindows - 1]);
 
   ASSERT_EQ(gfx::Display::ROTATE_0,
             gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().rotation());
 
   SplitViewController* controller = api()->GetSplitViewController();
@@ skipping 16 matching lines @@
   // Entering splitview should now be disabled now that the screen is in a
   // portrait orientation.
   EXPECT_FALSE(IsSplitViewAllowed());
 
   // Rotating back to 0 allows splitview again.
   ScreenManager::Get()->SetRotation(gfx::Display::ROTATE_0);
   EXPECT_TRUE(IsSplitViewAllowed());
 }
 
 }  // namespace athena