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

ash/display/screen_position_controller_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 "ash/display/screen_position_controller.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ui/aura/env.h"
@@ skipping 32 matching lines @@
 class ScreenPositionControllerTest : public test::AshTestBase {
  public:
   ScreenPositionControllerTest() : window_(NULL) {}
   virtual ~ScreenPositionControllerTest() {}
 
   virtual void SetUp() OVERRIDE {
     AshTestBase::SetUp();
     window_.reset(new aura::Window(&window_delegate_));
     window_->SetType(aura::client::WINDOW_TYPE_NORMAL);
     window_->Init(ui::LAYER_NOT_DRAWN);
-    window_->SetParent(NULL);
+    SetDefaultParentByPrimaryRootWindow(window_.get());
     window_->set_id(1);
   }
 
   virtual void TearDown() OVERRIDE {
     window_.reset();
     AshTestBase::TearDown();
   }
 
   // Converts a native point (x, y) to screen and returns its string
   // representation.
@@ skipping 122 matching lines @@
   EXPECT_EQ("120,35", ConvertNativePointToScreen(200, 30));
   // At the edge but still in the primary display.  Remaining of the primary
   // display is (50, 50) but adding ~100 since it's 2x-display.
   EXPECT_EQ("99,99", ConvertNativePointToScreen(159, 159));
   // At the edge of the secondary display.
   EXPECT_EQ("100,100", ConvertNativePointToScreen(160, 160));
 }
 
 }  // namespace test
 }  // namespace ash