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

views/test/views_test_base.h

Index: views/test/views_test_base.h
===================================================================
--- views/test/views_test_base.h	(revision 104542)
+++ views/test/views_test_base.h	(working copy)
@@ -12,6 +12,10 @@
 #include "base/message_loop.h"
 #include "views/test/test_views_delegate.h"
 
+#if defined(USE_AURA)
+#include "ui/aura/test_desktop_delegate.h"
+#endif
+
 namespace views {
 
 class TestViewsDelegate;
@@ -41,6 +45,9 @@
   scoped_ptr<TestViewsDelegate> views_delegate_;
   bool setup_called_;
   bool teardown_called_;
+#if defined(USE_AURA)
+  aura::TestDesktopDelegate desktop_delegate_;
+#endif
 
   DISALLOW_COPY_AND_ASSIGN(ViewsTestBase);
 };