Moves management of transients out of Window

ui/views/corewm/shadow_controller_unittest.cc

 // Copyright (c) 2012 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 "ui/views/corewm/shadow_controller.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/views/corewm/shadow.h"
 #include "ui/views/corewm/shadow_types.h"
+#include "ui/views/corewm/transient_window_manager.h"
+#include "ui/views/test/views_test_base.h"
 
 namespace views {
 namespace corewm {
 
-class ShadowControllerTest : public aura::test::AuraTestBase {
+class ShadowControllerTest : public ViewsTestBase {
  public:
   ShadowControllerTest() {}
   virtual ~ShadowControllerTest() {}
 
   virtual void SetUp() OVERRIDE {
-    AuraTestBase::SetUp();
+    ViewsTestBase::SetUp();
     aura::client::ActivationClient* activation_client =
-        aura::client::GetActivationClient(root_window());
+        aura::client::GetActivationClient(GetContext());
     shadow_controller_.reset(new ShadowController(activation_client));
   }
   virtual void TearDown() OVERRIDE {
     shadow_controller_.reset();
-    AuraTestBase::TearDown();
+    ViewsTestBase::TearDown();
   }
 
  protected:
   ShadowController* shadow_controller() { return shadow_controller_.get(); }
 
   void ActivateWindow(aura::Window* window) {
     DCHECK(window);
     DCHECK(window->GetRootWindow());
     aura::client::GetActivationClient(window->GetRootWindow())->ActivateWindow(
         window);
   }
 
+  void ParentWindow(aura::Window* window) {
+    aura::client::ParentWindowWithContext(window, GetContext(), gfx::Rect());
+  }
+
  private:
   scoped_ptr<ShadowController> shadow_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(ShadowControllerTest);
 };
 
 // Tests that various methods in Window update the Shadow object as expected.
 TEST_F(ShadowControllerTest, Shadow) {
   scoped_ptr<aura::Window> window(new aura::Window(NULL));
   window->SetType(aura::client::WINDOW_TYPE_NORMAL);
@@ skipping 135 matching lines @@
   EXPECT_EQ(Shadow::STYLE_ACTIVE, shadow1->style());
 
   // Create a window that is transient to window1, and that has the 'hide on
   // deactivate' property set. Upon activation, window1 should still have an
   // active shadow.
   scoped_ptr<aura::Window> window2(new aura::Window(NULL));
   window2->SetType(aura::client::WINDOW_TYPE_NORMAL);
   window2->Init(ui::LAYER_TEXTURED);
   ParentWindow(window2.get());
   window2->SetBounds(gfx::Rect(11, 21, 301, 401));
-  window1->AddTransientChild(window2.get());
+  AddTransientChild(window1.get(), window2.get());
   aura::client::SetHideOnDeactivate(window2.get(), true);
   window2->Show();
   ActivateWindow(window2.get());
 
   // window1 is now inactive, but its shadow should still appear active.
   EXPECT_EQ(Shadow::STYLE_ACTIVE, shadow1->style());
 }
 
 }  // namespace corewm
 }  // namespace views