Support modal windows

athena/wm/split_view_controller_unittest.cc

Index: athena/wm/split_view_controller_unittest.cc
diff --git a/athena/wm/split_view_controller_unittest.cc b/athena/wm/split_view_controller_unittest.cc
index 91e7ee5d357a79f697142236a470c0e8195b439c..c90a3cf6eef4b81d7dff9fbd265ac4fd3e9ccd6d 100644
--- a/athena/wm/split_view_controller_unittest.cc
+++ b/athena/wm/split_view_controller_unittest.cc
@@ -6,6 +6,7 @@
 
 #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"
@@ -102,7 +103,7 @@ TEST_F(SplitViewControllerTest, SplitModeActivation) {
   ScopedVector<aura::Window> windows;
   const int kNumWindows = 6;
   for (size_t i = 0; i < kNumWindows; ++i) {
-    scoped_ptr<aura::Window> window = CreateTestWindow(NULL, gfx::Rect());
+    scoped_ptr<aura::Window> window = test::CreateNormalWindow(NULL, NULL);
     windows.push_back(window.release());
     windows[i]->Hide();
   }
@@ -194,7 +195,7 @@ TEST_F(SplitViewControllerTest, ScrollDragHandle) {
   ScopedVector<aura::Window> windows;
   const int kNumWindows = 2;
   for (size_t i = 0; i < kNumWindows; ++i) {
-    scoped_ptr<aura::Window> window = CreateTestWindow(NULL, gfx::Rect());
+    scoped_ptr<aura::Window> window = test::CreateNormalWindow(NULL, NULL);
     windows.push_back(window.release());
     windows[i]->Hide();
   }
@@ -290,7 +291,7 @@ TEST_F(SplitViewControllerTest, LandscapeOnly) {
   ScopedVector<aura::Window> windows;
   const int kNumWindows = 2;
   for (size_t i = 0; i < kNumWindows; ++i) {
-    scoped_ptr<aura::Window> window = CreateTestWindow(NULL, gfx::Rect());
+    scoped_ptr<aura::Window> window = test::CreateNormalWindow(NULL, NULL);
     window->Hide();
     windows.push_back(window.release());
   }