Renames aura::client::WindowTreeClient to WindowParentingClient

ui/aura/demo/demo_main.cc

Index: ui/aura/demo/demo_main.cc
diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc
index 95f99a23ff9b7da6b6ffc054280597dd9b0aa954..61ea75fe8775de6a93d704e6fee5ba1044c73e0d 100644
--- a/ui/aura/demo/demo_main.cc
+++ b/ui/aura/demo/demo_main.cc
@@ -17,7 +17,7 @@
 #include "cc/surfaces/surface_manager.h"
 #include "third_party/skia/include/core/SkXfermode.h"
 #include "ui/aura/client/default_capture_client.h"
-#include "ui/aura/client/window_tree_client.h"
+#include "ui/aura/client/window_parenting_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/test_focus_client.h"
 #include "ui/aura/test/test_screen.h"
@@ -96,17 +96,17 @@ class DemoWindowDelegate : public aura::WindowDelegate {
   DISALLOW_COPY_AND_ASSIGN(DemoWindowDelegate);
 };
 
-class DemoWindowTreeClient : public aura::client::WindowTreeClient {
+class DemoWindowParentingClient : public aura::client::WindowParentingClient {
  public:
-  explicit DemoWindowTreeClient(aura::Window* window) : window_(window) {
-    aura::client::SetWindowTreeClient(window_, this);
+  explicit DemoWindowParentingClient(aura::Window* window) : window_(window) {
+    aura::client::SetWindowParentingClient(window_, this);
   }
 
-  ~DemoWindowTreeClient() override {
-    aura::client::SetWindowTreeClient(window_, nullptr);
+  ~DemoWindowParentingClient() override {
+    aura::client::SetWindowParentingClient(window_, nullptr);
   }
 
-  // Overridden from aura::client::WindowTreeClient:
+  // Overridden from aura::client::WindowParentingClient:
   aura::Window* GetDefaultParent(aura::Window* context,
                                  aura::Window* window,
                                  const gfx::Rect& bounds) override {
@@ -122,7 +122,7 @@ class DemoWindowTreeClient : public aura::client::WindowTreeClient {
 
   std::unique_ptr<aura::client::DefaultCaptureClient> capture_client_;
 
-  DISALLOW_COPY_AND_ASSIGN(DemoWindowTreeClient);
+  DISALLOW_COPY_AND_ASSIGN(DemoWindowParentingClient);
 };
 
 int DemoMain() {
@@ -159,8 +159,8 @@ int DemoMain() {
   display::Screen::SetScreenInstance(test_screen.get());
   std::unique_ptr<aura::WindowTreeHost> host(
       test_screen->CreateHostForPrimaryDisplay());
-  std::unique_ptr<DemoWindowTreeClient> window_tree_client(
-      new DemoWindowTreeClient(host->window()));
+  std::unique_ptr<DemoWindowParentingClient> window_parenting_client(
+      new DemoWindowParentingClient(host->window()));
   aura::test::TestFocusClient focus_client;
   aura::client::SetFocusClient(host->window(), &focus_client);