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

ash/test/ash_test_base.h

Index: ash/test/ash_test_base.h
diff --git a/ash/test/ash_test_base.h b/ash/test/ash_test_base.h
index e21225a991dd5da6547f4ee98cd2205a2b1366d9..b2380c1f075be2fa7a639f5619ba9d7a2ba25125 100644
--- a/ash/test/ash_test_base.h
+++ b/ash/test/ash_test_base.h
@@ -11,8 +11,15 @@
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/skia/include/core/SkColor.h"
+#include "ui/aura/client/window_types.h"
 #include "ui/views/test/test_views_delegate.h"
 
+namespace aura {
+class Window;
+class WindowDelegate;
+}
+
 namespace ash {
 namespace internal {
 class DisplayManager;
@@ -49,6 +56,26 @@ class AshTestBase : public testing::Test {
   // See ash::test::DisplayManagerTestApi::UpdateDisplay for more details.
   void UpdateDisplay(const std::string& display_specs);
 
+  // Versions of the functions in aura::test:: that go through our shell
+  // StackingController instead of taking a parent.
+  aura::Window* CreateTestWindowInShellWithId(int id);
+  aura::Window* CreateTestWindowInShellWithBounds(const gfx::Rect& bounds);
+  aura::Window* CreateTestWindowInShell(SkColor color,
+                                        int id,
+                                        const gfx::Rect& bounds);
+  aura::Window* CreateTestWindowInShellWithDelegate(
+      aura::WindowDelegate* delegate,
+      int id,
+      const gfx::Rect& bounds);
+  aura::Window* CreateTestWindowInShellWithDelegateAndType(
+      aura::WindowDelegate* delegate,
+      aura::client::WindowType type,
+      int id,
+      const gfx::Rect& bounds);
+
+  // Attach this to the current shell's root window.
+  void AddToRootWindow(aura::Window* window);
+
  protected:
   void RunAllPendingInMessageLoop();