Revert of Support modal windows

athena/activity/activity_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/activity/activity_manager_impl.h"
 
 #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 {
 
 typedef test::AthenaTestBase ActivityManagerTest;
 
 TEST_F(ActivityManagerTest, Basic) {
   ActivityManagerImpl* activity_manager =
       static_cast<ActivityManagerImpl*>(ActivityManager::Get());
   ActivityFactory* factory = ActivityFactory::Get();
@@ skipping 26 matching lines @@
   Activity* activity1 =
       factory->CreateWebActivity(NULL, base::string16(), GURL());
   Activity* activity2 =
       factory->CreateWebActivity(NULL, base::string16(), GURL());
 
   EXPECT_EQ(activity1, manager->GetActivityForWindow(activity1->GetWindow()));
   EXPECT_EQ(activity2, manager->GetActivityForWindow(activity2->GetWindow()));
 
   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()));
 }
 
 }  // namespace athena