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

ash/drag_drop/drag_drop_tracker_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/drag_drop/drag_drop_tracker.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 
 namespace ash {
 namespace test {
 
 class DragDropTrackerTest : public test::AshTestBase {
  public:
   virtual void SetUp() OVERRIDE {
     AshTestBase::SetUp();
     UpdateDisplay("200x200,200x200");
   }
 
-  static aura::Window* CreateTestWindow(const gfx::Rect& bounds,
-                                        aura::Window* parent) {
+  aura::Window* CreateTestWindow(const gfx::Rect& bounds) {
     static int window_id = 0;
-    return aura::test::CreateTestWindowWithDelegate(
+    return CreateTestWindowInShellWithDelegate(
         aura::test::TestWindowDelegate::CreateSelfDestroyingDelegate(),
         window_id++,
-        bounds,
-        parent);
+        bounds);
   }
 
   static aura::Window* GetTarget(const gfx::Point& location) {
     scoped_ptr<internal::DragDropTracker> tracker(
-        new internal::DragDropTracker);
+        new internal::DragDropTracker(Shell::GetPrimaryRootWindow()));
     ui::MouseEvent e(ui::ET_MOUSE_DRAGGED,
                      location,
                      location,
                      ui::EF_NONE);
     aura::Window* target = tracker->GetTarget(e);
     return target;
   }
 
   static ui::MouseEvent* ConvertMouseEvent(aura::Window* target,
                                            const ui::MouseEvent& event) {
     scoped_ptr<internal::DragDropTracker> tracker(
-        new internal::DragDropTracker);
+        new internal::DragDropTracker(Shell::GetPrimaryRootWindow()));
     ui::MouseEvent* converted = tracker->ConvertMouseEvent(target, event);
     return converted;
   }
 };
 
 // TODO(mazda): Remove this once ash/wm/coordinate_conversion.h supports
 // non-X11 platforms.
 #if defined(USE_X11)
 #define MAYBE_GetTarget GetTarget
 #else
 #define MAYBE_GetTarget DISABLED_GetTarget
 #endif
 
 TEST_F(DragDropTrackerTest, MAYBE_GetTarget) {
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   EXPECT_EQ(2U, root_windows.size());
 
   Shell::GetInstance()->set_active_root_window(root_windows[0]);
 
   scoped_ptr<aura::Window> window0(
-      CreateTestWindow(gfx::Rect(0, 0, 100, 100), NULL));
+      CreateTestWindow(gfx::Rect(0, 0, 100, 100)));
   window0->Show();
 
   Shell::GetInstance()->set_active_root_window(root_windows[1]);
 
   scoped_ptr<aura::Window> window1(
-      CreateTestWindow(gfx::Rect(100, 100, 100, 100), NULL));
+      CreateTestWindow(gfx::Rect(100, 100, 100, 100)));
   window1->Show();
 
   // Make RootWindow0 active so that capture window is parented to it.
   Shell::GetInstance()->set_active_root_window(root_windows[0]);
 
   // Start tracking from the RootWindow1 and check the point on RootWindow0 that
   // |window0| covers.
   EXPECT_EQ(window0.get(), GetTarget(gfx::Point(50, 50)));
 
   // Start tracking from the RootWindow0 and check the point on RootWindow0 that
@@ skipping 39 matching lines @@
 #else
 #define MAYBE_ConvertMouseEvent DISABLED_ConvertMouseEvent
 #endif
 
 TEST_F(DragDropTrackerTest, MAYBE_ConvertMouseEvent) {
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   EXPECT_EQ(2U, root_windows.size());
 
   Shell::GetInstance()->set_active_root_window(root_windows[0]);
   scoped_ptr<aura::Window> window0(
-      CreateTestWindow(gfx::Rect(0, 0, 100, 100), NULL));
+      CreateTestWindow(gfx::Rect(0, 0, 100, 100)));
   window0->Show();
 
   Shell::GetInstance()->set_active_root_window(root_windows[1]);
   scoped_ptr<aura::Window> window1(
-      CreateTestWindow(gfx::Rect(100, 100, 100, 100), NULL));
+      CreateTestWindow(gfx::Rect(100, 100, 100, 100)));
   window1->Show();
 
   // Make RootWindow0 active so that capture window is parented to it.
   Shell::GetInstance()->set_active_root_window(root_windows[0]);
 
   // Start tracking from the RootWindow0 and converts the mouse event into
   // |window0|'s coodinates.
   ui::MouseEvent original00(ui::ET_MOUSE_DRAGGED,
                             gfx::Point(50, 50),
                             gfx::Point(50, 50),
@@ skipping 43 matching lines @@
   scoped_ptr<ui::MouseEvent> converted11(ConvertMouseEvent(window1.get(),
                                                            original11));
   EXPECT_EQ(original11.type(), converted11->type());
   EXPECT_EQ("50,50", converted11->location().ToString());
   EXPECT_EQ("150,150", converted11->root_location().ToString());
   EXPECT_EQ(original11.flags(), converted11->flags());
 }
 
 }  // namespace test
 }  // namespace aura