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

ash/test/ash_test_base.h

 // 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.
 
 #ifndef ASH_TEST_ASH_TEST_BASE_H_
 #define ASH_TEST_ASH_TEST_BASE_H_
 
 #include <string>
 
 #include "ash/shell.h"
 #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;
 }  // internal
 
 namespace test {
 
 class TestShellDelegate;
 
 class AshTestViewsDelegate : public views::TestViewsDelegate {
@@ skipping 16 matching lines @@
   virtual void TearDown() OVERRIDE;
 
   // Change the primary display's configuration to use |bounds|
   // and |scale|.
   void ChangeDisplayConfig(float scale, const gfx::Rect& bounds);
 
   // Update the display configuration as given in |display_specs|.
   // 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 |window| to the current shell's root window.
+  void SetDefaultParentByPrimaryRootWindow(aura::Window* window);
+
  protected:
   void RunAllPendingInMessageLoop();
 
   // Utility methods to emulate user logged in or not, session started or not
   // and user able to lock screen or not cases.
   void SetSessionStarted(bool session_started);
   void SetUserLoggedIn(bool user_logged_in);
   void SetCanLockScreen(bool can_lock_screen);
 
  private:
   MessageLoopForUI message_loop_;
 
   TestShellDelegate* test_shell_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(AshTestBase);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_ASH_TEST_BASE_H_