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

ash/wm/video_detector_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/video_detector.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_util.h"
 #include "base/compiler_specific.h"
@@ skipping 82 matching lines @@
 
   base::TimeTicks now_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(VideoDetectorTest);
 };
 
 TEST_F(VideoDetectorTest, Basic) {
   gfx::Rect window_bounds(gfx::Point(), gfx::Size(1024, 768));
   scoped_ptr<aura::Window> window(
-      aura::test::CreateTestWindow(SK_ColorRED, 12345, window_bounds, NULL));
+      CreateTestWindowInShell(SK_ColorRED, 12345, window_bounds));
 
   // Send enough updates, but make them be too small to trigger detection.
   gfx::Rect update_region(
       gfx::Point(),
       gfx::Size(VideoDetector::kMinUpdateWidth - 1,
                 VideoDetector::kMinUpdateHeight));
   for (int i = 0; i < VideoDetector::kMinFramesPerSecond; ++i)
     detector_->OnWindowPaintScheduled(window.get(), update_region);
   EXPECT_EQ(0, observer_->num_invocations());
 
@@ skipping 25 matching lines @@
     detector_->OnWindowPaintScheduled(window.get(), update_region);
   AdvanceTime(base::TimeDelta::FromSeconds(1));
   for (int i = 0; i < VideoDetector::kMinFramesPerSecond - 1; ++i)
     detector_->OnWindowPaintScheduled(window.get(), update_region);
   EXPECT_EQ(0, observer_->num_invocations());
 }
 
 TEST_F(VideoDetectorTest, WindowNotVisible) {
   gfx::Rect window_bounds(gfx::Point(), gfx::Size(1024, 768));
   scoped_ptr<aura::Window> window(
-      aura::test::CreateTestWindow(SK_ColorRED, 12345, window_bounds, NULL));
+      CreateTestWindowInShell(SK_ColorRED, 12345, window_bounds));
 
   // Reparent the window to the root to make sure that visibility changes aren't
   // animated.
   Shell::GetPrimaryRootWindow()->AddChild(window.get());
 
   // We shouldn't report video that's played in a hidden window.
   window->Hide();
   gfx::Rect update_region(
       gfx::Point(),
       gfx::Size(VideoDetector::kMinUpdateWidth,
@@ skipping 22 matching lines @@
   ASSERT_EQ(offscreen_bounds, window->bounds());
   for (int i = 0; i < VideoDetector::kMinFramesPerSecond; ++i)
     detector_->OnWindowPaintScheduled(window.get(), update_region);
   EXPECT_EQ(0, observer_->num_invocations());
 }
 
 TEST_F(VideoDetectorTest, MultipleWindows) {
   // Create two windows.
   gfx::Rect window_bounds(gfx::Point(), gfx::Size(1024, 768));
   scoped_ptr<aura::Window> window1(
-      aura::test::CreateTestWindow(SK_ColorRED, 12345, window_bounds, NULL));
+      CreateTestWindowInShell(SK_ColorRED, 12345, window_bounds));
   scoped_ptr<aura::Window> window2(
-      aura::test::CreateTestWindow(SK_ColorBLUE, 23456, window_bounds, NULL));
+      CreateTestWindowInShell(SK_ColorBLUE, 23456, window_bounds));
 
   // Even if there's video playing in both, the observer should only receive a
   // single notification.
   gfx::Rect update_region(
       gfx::Point(),
       gfx::Size(VideoDetector::kMinUpdateWidth,
                 VideoDetector::kMinUpdateHeight));
   for (int i = 0; i < VideoDetector::kMinFramesPerSecond; ++i)
     detector_->OnWindowPaintScheduled(window1.get(), update_region);
   for (int i = 0; i < VideoDetector::kMinFramesPerSecond; ++i)
     detector_->OnWindowPaintScheduled(window2.get(), update_region);
   EXPECT_EQ(1, observer_->num_invocations());
   EXPECT_EQ(0, observer_->num_fullscreens());
   EXPECT_EQ(1, observer_->num_not_fullscreens());
 }
 
 // Test that the observer receives repeated notifications.
 TEST_F(VideoDetectorTest, RepeatedNotifications) {
   gfx::Rect window_bounds(gfx::Point(), gfx::Size(1024, 768));
   scoped_ptr<aura::Window> window(
-      aura::test::CreateTestWindow(SK_ColorRED, 12345, window_bounds, NULL));
+      CreateTestWindowInShell(SK_ColorRED, 12345, window_bounds));
 
   gfx::Rect update_region(
       gfx::Point(),
       gfx::Size(VideoDetector::kMinUpdateWidth,
                 VideoDetector::kMinUpdateHeight));
   for (int i = 0; i < VideoDetector::kMinFramesPerSecond; ++i)
     detector_->OnWindowPaintScheduled(window.get(), update_region);
   EXPECT_EQ(1, observer_->num_invocations());
   EXPECT_EQ(0, observer_->num_fullscreens());
   EXPECT_EQ(1, observer_->num_not_fullscreens());
   // Let enough time pass that a second notification should be sent.
   observer_->reset_stats();
   AdvanceTime(base::TimeDelta::FromSeconds(
       static_cast<int64>(VideoDetector::kNotifyIntervalSec + 1)));
   for (int i = 0; i < VideoDetector::kMinFramesPerSecond; ++i)
     detector_->OnWindowPaintScheduled(window.get(), update_region);
   EXPECT_EQ(1, observer_->num_invocations());
   EXPECT_EQ(0, observer_->num_fullscreens());
   EXPECT_EQ(1, observer_->num_not_fullscreens());
 }
 
 // Test that the observer receives a true value when the window is fullscreen.
 TEST_F(VideoDetectorTest, FullscreenWindow) {
   gfx::Rect window_bounds(gfx::Point(), gfx::Size(1024, 768));
   scoped_ptr<aura::Window> window(
-      aura::test::CreateTestWindow(SK_ColorRED, 12345, window_bounds, NULL));
+      CreateTestWindowInShell(SK_ColorRED, 12345, window_bounds));
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
   window->Focus();
   gfx::Rect update_region(
       gfx::Point(),
       gfx::Size(VideoDetector::kMinUpdateWidth,
                 VideoDetector::kMinUpdateHeight));
   for (int i = 0; i < VideoDetector::kMinFramesPerSecond; ++i)
     detector_->OnWindowPaintScheduled(window.get(), update_region);
   EXPECT_EQ(1, observer_->num_invocations());
   EXPECT_EQ(1, observer_->num_fullscreens());
   EXPECT_EQ(0, observer_->num_not_fullscreens());
 }
 
 }  // namespace test
 }  // namespace ash