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

chrome/browser/ui/window_sizer/window_sizer_ash_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 "chrome/browser/ui/window_sizer/window_sizer_common_unittest.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_shell_delegate.h"
 #include "ash/wm/window_resizer.h"
@@ skipping 427 matching lines @@
                         738 /* not 739 */,
                         500,
                         400).ToString(),
               window_bounds.ToString());
   }
 }
 
 // Test the placement of newly created windows.
 TEST_F(WindowSizerTestWithBrowser, PlaceNewWindows) {
   // Create a dummy window.
-  scoped_ptr<aura::Window> window(
-      aura::test::CreateTestWindowWithId(0, NULL));
+  scoped_ptr<aura::Window> window(CreateTestWindowInShellWithId(0));
   window->SetBounds(gfx::Rect(16, 32, 640, 320));
 
-  scoped_ptr<aura::Window> popup(
-      aura::test::CreateTestWindowWithId(1, NULL));
+  scoped_ptr<aura::Window> popup(CreateTestWindowInShellWithId(1));
   popup->SetBounds(gfx::Rect(16, 32, 128, 256));
 
-  scoped_ptr<aura::Window> panel(
-      aura::test::CreateTestWindowWithId(2, NULL));
+  scoped_ptr<aura::Window> panel(CreateTestWindowInShellWithId(2));
   panel->SetBounds(gfx::Rect(32, 48, 256, 512));
 
   // Create a browser which we can use to pass into the GetWindowBounds
   // function.
   scoped_ptr<TestingProfile> profile(new TestingProfile());
   // Creating a popup handler here to make sure it does not interfere with the
   // existing windows.
   scoped_ptr<Browser> browser(
       chrome::CreateBrowserWithTestWindowForProfile(profile.get()));
 
@@ skipping 82 matching lines @@
                         WindowSizer::kDesktopBorderSize,
                         1024 - 2 * WindowSizer::kDesktopBorderSize,
                         768 - WindowSizer::kDesktopBorderSize).ToString(),
               window_bounds.ToString());
   }
 }
 
 // Test that the show state is properly returned for non default cases.
 TEST_F(WindowSizerTestWithBrowser, TestShowState) {
   // Creating a browser & window to play with.
-  scoped_ptr<aura::Window> window(
-      aura::test::CreateTestWindowWithId(0, NULL));
+  scoped_ptr<aura::Window> window(CreateTestWindowInShellWithId(0));
   window->SetBounds(gfx::Rect(16, 32, 640, 320));
 
   scoped_ptr<TestingProfile> profile(new TestingProfile());
 
   scoped_ptr<BrowserWindow> browser_window(
       new TestBrowserWindowAura(window.get()));
   Browser::CreateParams window_params(Browser::TYPE_TABBED, profile.get());
   window_params.window = browser_window.get();
   scoped_ptr<Browser> browser(new Browser(window_params));
 
   // Create also a popup browser since that behaves different.
-  scoped_ptr<aura::Window> popup(
-      aura::test::CreateTestWindowWithId(1, NULL));
+  scoped_ptr<aura::Window> popup(CreateTestWindowInShellWithId(1));
   popup->SetBounds(gfx::Rect(16, 32, 128, 256));
 
   scoped_ptr<BrowserWindow> browser_popup(
       new TestBrowserWindowAura(popup.get()));
   Browser::CreateParams popup_params(Browser::TYPE_POPUP, profile.get());
   popup_params.window = browser_window.get();
   scoped_ptr<Browser> popup_browser(new Browser(popup_params));
 
   // Tabbed windows should retrieve the saved window state - since there is a
   // top window.
@@ skipping 16 matching lines @@
   // The non tabbed window will take the status of the last active of its kind.
   EXPECT_EQ(ui::SHOW_STATE_NORMAL,
             GetWindowShowState(ui::SHOW_STATE_DEFAULT,
                                ui::SHOW_STATE_NORMAL,
                                BOTH,
                                popup_browser.get()));
 
   // Now create a top level window and check again for both. Only the tabbed
   // window should follow the top level window's state.
   // Creating a browser & window to play with.
-  scoped_ptr<aura::Window> window2(
-      aura::test::CreateTestWindowWithId(0, NULL));
+  scoped_ptr<aura::Window> window2(CreateTestWindowInShellWithId(0));
   window->SetBounds(gfx::Rect(16, 32, 640, 320));
 
   scoped_ptr<BrowserWindow> browser_window2(
       new TestBrowserWindowAura(window2.get()));
   Browser::CreateParams window2_params(Browser::TYPE_TABBED, profile.get());
   window2_params.window = browser_window2.get();
   scoped_ptr<Browser> browser2(new Browser(window2_params));
 
   // A tabbed window should now take the top level window state.
   EXPECT_EQ(ui::SHOW_STATE_DEFAULT,
             GetWindowShowState(ui::SHOW_STATE_MAXIMIZED,
                                ui::SHOW_STATE_DEFAULT,
                                BOTH,
                                browser2.get()));
   // Non tabbed windows should always follow the window saved visibility state.
   EXPECT_EQ(ui::SHOW_STATE_MAXIMIZED,
             GetWindowShowState(ui::SHOW_STATE_MAXIMIZED,
                                ui::SHOW_STATE_MINIMIZED,
                                BOTH,
                                popup_browser.get()));
 }
 
 // Test that the default show state override behavior is properly handled.
 TEST_F(WindowSizerTestWithBrowser, TestShowStateDefaults) {
   // Creating a browser & window to play with.
-  scoped_ptr<aura::Window> window(
-      aura::test::CreateTestWindowWithId(0, NULL));
+  scoped_ptr<aura::Window> window(CreateTestWindowInShellWithId(0));
   window->SetBounds(gfx::Rect(16, 32, 640, 320));
 
   scoped_ptr<TestingProfile> profile(new TestingProfile());
 
   scoped_ptr<BrowserWindow> browser_window(
       new TestBrowserWindowAura(window.get()));
   Browser::CreateParams window_params(Browser::TYPE_TABBED, profile.get());
   window_params.window = browser_window.get();
   scoped_ptr<Browser> browser(new Browser(window_params));
 
   // Create also a popup browser since that behaves slightly different for
   // defaults.
-  scoped_ptr<aura::Window> popup(
-      aura::test::CreateTestWindowWithId(1, NULL));
+  scoped_ptr<aura::Window> popup(CreateTestWindowInShellWithId(1));
   popup->SetBounds(gfx::Rect(16, 32, 128, 256));
 
   scoped_ptr<BrowserWindow> browser_popup(
       new TestBrowserWindowAura(popup.get()));
   Browser::CreateParams popup_params(Browser::TYPE_POPUP, profile.get());
   popup_params.window = browser_window.get();
   scoped_ptr<Browser> popup_browser(new Browser(popup_params));
 
   // Check that a browser creation state always get used if not given as
   // SHOW_STATE_DEFAULT.
@@ skipping 26 matching lines @@
                                ui::SHOW_STATE_NORMAL,
                                BOTH,
                                browser.get()), ui::SHOW_STATE_MAXIMIZED);
 
   // The popup should favor the initial show state over the command line.
   EXPECT_EQ(GetWindowShowState(ui::SHOW_STATE_NORMAL,
                                ui::SHOW_STATE_NORMAL,
                                BOTH,
                                popup_browser.get()), ui::SHOW_STATE_NORMAL);
 }