change the way windows are parented when their parent is set to NULL.

ui/aura/window_unittest.cc

 // Copyright (c) 2011 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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/desktop.h"
 #include "ui/aura/event.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
+#include "ui/aura/test_desktop_delegate.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 
 #if !defined(OS_WIN)
 #include "ui/aura/hit_test.h"
 #endif
 
 namespace aura {
@@ skipping 147 matching lines @@
   ui::KeyboardCode last_key_code_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWindowDelegate);
 };
 
 class WindowTest : public testing::Test {
  public:
   WindowTest() : main_message_loop(MessageLoop::TYPE_UI) {
     Desktop::GetInstance()->Show();
     Desktop::GetInstance()->SetSize(gfx::Size(500, 500));
-    if (!Desktop::GetInstance()->default_parent())
-      Desktop::GetInstance()->CreateDefaultParentForTesting();
   }
   virtual ~WindowTest() {}
 
   // Overridden from testing::Test:
   virtual void SetUp() OVERRIDE {
   }
 
   virtual void TearDown() OVERRIDE {
   }
 
@@ skipping 15 matching lines @@
                                        Window* parent) {
     Window* window = new Window(delegate);
     window->set_id(id);
     window->Init();
     window->SetBounds(bounds);
     window->Show();
     window->SetParent(parent);
     return window;
   }
 
+ protected:
+  Window* toplevel_container() {
+    return desktop_delegate_.default_container();
+  }
+
  private:
   MessageLoop main_message_loop;
+  TestDesktopDelegate desktop_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTest);
 };
 
 }  // namespace
 
 TEST_F(WindowTest, GetChildById) {
   scoped_ptr<Window> w1(CreateTestWindowWithId(1, NULL));
   scoped_ptr<Window> w11(CreateTestWindowWithId(11, w1.get()));
   scoped_ptr<Window> w111(CreateTestWindowWithId(111, w11.get()));
@@ skipping 30 matching lines @@
       CreateTestWindow(SK_ColorRED, 1111, gfx::Rect(5, 5, 50, 50), w111.get()));
   scoped_ptr<Window> w12(
       CreateTestWindow(SK_ColorMAGENTA, 12, gfx::Rect(10, 420, 25, 25),
                        w1.get()));
   scoped_ptr<Window> w121(
       CreateTestWindow(SK_ColorYELLOW, 121, gfx::Rect(5, 5, 5, 5), w12.get()));
   scoped_ptr<Window> w13(
       CreateTestWindow(SK_ColorGRAY, 13, gfx::Rect(5, 470, 50, 50), w1.get()));
 
   Window* desktop = Desktop::GetInstance()->window();
-  Desktop::GetInstance()->default_parent()->SetBounds(gfx::Rect(500, 500));
+  toplevel_container()->SetBounds(gfx::Rect(500, 500));
   EXPECT_EQ(NULL, desktop->GetEventHandlerForPoint(gfx::Point(5, 5)));
   EXPECT_EQ(w1.get(), desktop->GetEventHandlerForPoint(gfx::Point(11, 11)));
   EXPECT_EQ(w11.get(), desktop->GetEventHandlerForPoint(gfx::Point(16, 16)));
   EXPECT_EQ(w111.get(), desktop->GetEventHandlerForPoint(gfx::Point(21, 21)));
   EXPECT_EQ(w1111.get(), desktop->GetEventHandlerForPoint(gfx::Point(26, 26)));
   EXPECT_EQ(w12.get(), desktop->GetEventHandlerForPoint(gfx::Point(21, 431)));
   EXPECT_EQ(w121.get(), desktop->GetEventHandlerForPoint(gfx::Point(26, 436)));
   EXPECT_EQ(w13.get(), desktop->GetEventHandlerForPoint(gfx::Point(26, 481)));
 }
 
@@ skipping 454 matching lines @@
   w->Maximize();
   EXPECT_EQ(ui::SHOW_STATE_MAXIMIZED, w->show_state());
   EXPECT_EQ(max_bounds, w->bounds());
   w->Restore();
   EXPECT_EQ(ui::SHOW_STATE_NORMAL, w->show_state());
   EXPECT_EQ(original_bounds, w->bounds());
 }
 
 }  // namespace internal
 }  // namespace aura