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

chrome/browser/ui/ash/window_positioner_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/ash/window_positioner.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 103 matching lines @@
 }
 
 WindowPositionerTest::~WindowPositionerTest() {
   profile_.reset(NULL);
   ui_thread_.reset(NULL);
 }
 
 void WindowPositionerTest::SetUp() {
   AshTestBase::SetUp();
   // Create some default dummy windows.
-  window_.reset(aura::test::CreateTestWindowWithId(0, NULL));
+  window_.reset(CreateTestWindowInShellWithId(0));
   window_->SetBounds(gfx::Rect(16, 32, 640, 320));
-  popup_.reset(aura::test::CreateTestWindowWithId(1, NULL));
+  popup_.reset(CreateTestWindowInShellWithId(1));
   popup_->SetBounds(gfx::Rect(16, 32, 128, 256));
-  panel_.reset(aura::test::CreateTestWindowWithId(2, NULL));
+  panel_.reset(CreateTestWindowInShellWithId(2));
   panel_->SetBounds(gfx::Rect(32, 48, 256, 512));
 
   // Create a browser for the window.
   browser_window_.reset(new TestBrowserWindowAura(window_.get()));
   Browser::CreateParams window_params(profile_.get());
   window_params.window = browser_window_.get();
   window_owning_browser_.reset(new Browser(window_params));
 
   // Creating a browser for the popup.
   browser_popup_.reset(new TestBrowserWindowAura(popup_.get()));
@@ skipping 180 matching lines @@
 
   // Check that the popup is placed full screen.
   gfx::Rect full = window_positioner()->GetPopupPosition(pop_position);
   EXPECT_EQ(gfx::Rect(work_area.x(), work_area.y(),
                       pop_position.width(), pop_position.height()),
                       full);
 }
 
 }  // namespace test
 }  // namespace ash