Rename StackingClient -> WindowTreeClient

ash/wm/header_painter_unittest.cc

 // Copyright 2013 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/wm/header_painter.h"
 
 #include "ash/ash_constants.h"
 #include "ash/root_window_settings.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "grit/ash_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/client/aura_constants.h"
+#include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/hit_test.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/views/widget/widget_observer.h"
 #include "ui/views/window/non_client_view.h"
 
@@ skipping 358 matching lines @@
   scoped_ptr<HeaderPainter> painter(CreateTestPainter(widget.get()));
   widget->Show();
 
   // We only have one window, so it should use a solo header.
   EXPECT_TRUE(painter->UseSoloWindowHeader());
 
   // Create non-drawing window similar to DragDropTracker.
   scoped_ptr<aura::Window> window(new aura::Window(NULL));
   window->SetType(aura::client::WINDOW_TYPE_NORMAL);
   window->Init(ui::LAYER_NOT_DRAWN);
-  window->SetDefaultParentByRootWindow(
-      widget->GetNativeWindow()->GetRootWindow(), gfx::Rect());
+  aura::client::ParentWindowWithContext(window.get(), widget->GetNativeWindow(),
+                                        gfx::Rect());
   window->Show();
 
   // Despite two windows, the first window should still be considered "solo"
   // because non-drawing windows aren't included in the computation.
   EXPECT_TRUE(painter->UseSoloWindowHeader());
 }
 
 #if defined(OS_WIN)
 // Multiple displays are not supported on Windows Ash. http://crbug.com/165962
 #define MAYBE_UseSoloWindowHeaderMultiDisplay \
@@ skipping 246 matching lines @@
   HeaderPainterOwner* o2 = new HeaderPainterOwner(w2);
   HeaderPainter* p2 = o2->header_painter();
   w2->Show();
   EXPECT_FALSE(p1->UseSoloWindowHeader());
   EXPECT_FALSE(p2->UseSoloWindowHeader());
 
   // Exit with no resource release. They'll be released at shutdown.
 }
 
 }  // namespace ash