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

ash/wm/user_activity_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/user_activity_detector.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/user_activity_observer.h"
 #include "base/compiler_specific.h"
@@ skipping 70 matching lines @@
 
   base::TimeTicks now_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(UserActivityDetectorTest);
 };
 
 // Checks that the observer is notified in response to different types of input
 // events.
 TEST_F(UserActivityDetectorTest, Basic) {
-  scoped_ptr<aura::Window> window(
-      aura::test::CreateTestWindowWithId(12345, NULL));
+  scoped_ptr<aura::Window> window(CreateTestWindowInShellWithId(12345));
 
   ui::KeyEvent key_event(ui::ET_KEY_PRESSED, ui::VKEY_A, ui::EF_NONE, false);
   SetEventTarget(window.get(), &key_event);
   EXPECT_EQ(ui::ER_UNHANDLED, detector_->OnKeyEvent(&key_event));
   EXPECT_EQ(1, observer_->num_invocations());
   observer_->reset_stats();
 
   base::TimeDelta advance_delta =
       base::TimeDelta::FromSeconds(UserActivityDetector::kNotifyIntervalMs);
   AdvanceTime(advance_delta);
@@ skipping 25 matching lines @@
       base::TimeDelta::FromMilliseconds(base::Time::Now().ToDoubleT() * 1000),
       ui::GestureEventDetails(ui::ET_GESTURE_TAP, 0, 0), 0U);
   SetEventTarget(window.get(), &gesture_event);
   EXPECT_FALSE(detector_->OnGestureEvent(&gesture_event));
   EXPECT_EQ(1, observer_->num_invocations());
   observer_->reset_stats();
 }
 
 // Checks that observers aren't notified too frequently.
 TEST_F(UserActivityDetectorTest, RateLimitNotifications) {
-  scoped_ptr<aura::Window> window(
-      aura::test::CreateTestWindowWithId(12345, NULL));
+  scoped_ptr<aura::Window> window(CreateTestWindowInShellWithId(12345));
 
   // The observer should be notified about a key event.
   ui::KeyEvent event(ui::ET_KEY_PRESSED, ui::VKEY_A, ui::EF_NONE, false);
   SetEventTarget(window.get(), &event);
   EXPECT_FALSE(detector_->OnKeyEvent(&event));
   EXPECT_EQ(1, observer_->num_invocations());
   observer_->reset_stats();
 
   // It shouldn't be notified if a second event occurs
   // in the same instant in time.
@@ skipping 13 matching lines @@
   // rate limit. This should let us trigger another notification.
   AdvanceTime(base::TimeDelta::FromMilliseconds(
       UserActivityDetector::kNotifyIntervalMs));
 
   EXPECT_EQ(ui::ER_UNHANDLED, detector_->OnKeyEvent(&event));
   EXPECT_EQ(1, observer_->num_invocations());
 }
 
 // Checks that the detector ignores synthetic mouse events.
 TEST_F(UserActivityDetectorTest, IgnoreSyntheticMouseEvents) {
-  scoped_ptr<aura::Window> window(
-      aura::test::CreateTestWindowWithId(12345, NULL));
+  scoped_ptr<aura::Window> window(CreateTestWindowInShellWithId(12345));
   ui::MouseEvent mouse_event(
       ui::ET_MOUSE_MOVED, gfx::Point(), gfx::Point(), ui::EF_IS_SYNTHESIZED);
   SetEventTarget(window.get(), &mouse_event);
   EXPECT_EQ(ui::ER_UNHANDLED, detector_->OnMouseEvent(&mouse_event));
   EXPECT_EQ(0, observer_->num_invocations());
 }
 
 }  // namespace test
 }  // namespace ash