Desktop aura: Break aura::Window::SetParent in two.

ash/wm/window_animations_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 "ash/wm/window_animations.h"
 
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/workspace_controller.h"
 #include "base/time.h"
@@ skipping 16 matching lines @@
   virtual void TearDown() OVERRIDE {
     ui::LayerAnimator::set_disable_animations_for_test(true);
     AshTestBase::TearDown();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WindowAnimationsTest);
 };
 
 TEST_F(WindowAnimationsTest, HideShowBrightnessGrayscaleAnimation) {
-  scoped_ptr<aura::Window> window(
-      aura::test::CreateTestWindowWithId(0, NULL));
+  scoped_ptr<aura::Window> window(CreateTestWindowInShellWithId(0));
   window->Show();
   EXPECT_TRUE(window->layer()->visible());
 
   // Hiding.
   SetWindowVisibilityAnimationType(
       window.get(),
       WINDOW_VISIBILITY_ANIMATION_TYPE_BRIGHTNESS_GRAYSCALE);
   ash::internal::AnimateOnChildWindowVisibilityChanged(
       window.get(), false);
   EXPECT_EQ(0.0f, window->layer()->GetTargetOpacity());
@@ skipping 15 matching lines @@
       static_cast<ui::AnimationContainerElement*>(
       window->layer()->GetAnimator());
   element->Step(base::TimeTicks::Now() +
                 base::TimeDelta::FromSeconds(5));
   EXPECT_EQ(0.0f, window->layer()->GetTargetBrightness());
   EXPECT_EQ(0.0f, window->layer()->GetTargetGrayscale());
   EXPECT_TRUE(window->layer()->visible());
 }
 
 TEST_F(WindowAnimationsTest, LayerTargetVisibility) {
-  scoped_ptr<aura::Window> window(
-      aura::test::CreateTestWindowWithId(0, NULL));
+  scoped_ptr<aura::Window> window(CreateTestWindowInShellWithId(0));
 
   // Layer target visibility changes according to Show/Hide.
   window->Show();
   EXPECT_TRUE(window->layer()->GetTargetVisibility());
   window->Hide();
   EXPECT_FALSE(window->layer()->GetTargetVisibility());
   window->Show();
   EXPECT_TRUE(window->layer()->GetTargetVisibility());
 }
 
 TEST_F(WindowAnimationsTest, CrossFadeToBounds) {
   ui::LayerAnimator::set_disable_animations_for_test(false);
 
-  scoped_ptr<Window> window(
-      aura::test::CreateTestWindowWithId(0, NULL));
+  scoped_ptr<Window> window(CreateTestWindowInShellWithId(0));
   window->SetBounds(gfx::Rect(5, 10, 320, 240));
   window->Show();
 
   Layer* old_layer = window->layer();
   EXPECT_EQ(1.0f, old_layer->GetTargetOpacity());
 
   // Cross fade to a larger size, as in a maximize animation.
   CrossFadeToBounds(window.get(), gfx::Rect(0, 0, 640, 480));
   // Window's layer has been replaced.
   EXPECT_NE(old_layer, window->layer());
@@ skipping 31 matching lines @@
   EXPECT_EQ(gfx::Transform(), window->layer()->GetTargetTransform());
 
   static_cast<ui::AnimationContainerElement*>(old_layer->GetAnimator())->Step(
       base::TimeTicks::Now() + base::TimeDelta::FromSeconds(1));
   static_cast<ui::AnimationContainerElement*>(window->layer()->GetAnimator())->
       Step(base::TimeTicks::Now() + base::TimeDelta::FromSeconds(1));
 }
 
 }  // namespace internal
 }  // namespace ash