Fix WindowTreeClient::RequestClose(window_id).

ui/aura/mus/window_tree_client_unittest.cc

 // Copyright 2015 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 "ui/aura/mus/window_tree_client.h"
 
 #include <stdint.h>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 14 matching lines @@
 #include "ui/aura/mus/window_tree_client_delegate.h"
 #include "ui/aura/mus/window_tree_client_observer.h"
 #include "ui/aura/mus/window_tree_host_mus.h"
 #include "ui/aura/test/aura_mus_test_base.h"
 #include "ui/aura/test/mus/test_window_tree.h"
 #include "ui/aura/test/mus/window_tree_client_private.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_property.h"
 #include "ui/aura/window_tracker.h"
+#include "ui/aura/window_tree_host_observer.h"
 #include "ui/compositor/compositor.h"
 #include "ui/display/display_switches.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace aura {
 
 namespace {
 
@@ skipping 1079 matching lines @@
   EXPECT_EQ(static_cast<int64_t>(property_value),
             mojo::ConvertTo<int64_t>(properties2[kTestPropertyServerKey1]));
 
   ASSERT_EQ(1u, properties2.count(kUnknownPropertyKey));
   ASSERT_EQ(sizeof(UnknownPropertyType),
             properties2[kUnknownPropertyKey].size());
   EXPECT_EQ(kUnknownPropertyValue, mojo::ConvertTo<UnknownPropertyType>(
                                        properties2[kUnknownPropertyKey]));
 }
 
+namespace {
+
+class CloseWindowTestWindowDelegate : public test::TestWindowDelegate {
+ public:
+  CloseWindowTestWindowDelegate() {}
+  ~CloseWindowTestWindowDelegate() override {}
+
+  bool window_closed() const { return window_closed_; }
+
+  // TestWindowDelegate::
+  void OnRequestClose() override { window_closed_ = true; }
+
+ private:
+  bool window_closed_ = false;
+
+  DISALLOW_COPY_AND_ASSIGN(CloseWindowTestWindowDelegate);
+};
+
+class CloseWindowWindowTreeHostObserver : public aura::WindowTreeHostObserver {
+ public:
+  CloseWindowWindowTreeHostObserver() {}
+  ~CloseWindowWindowTreeHostObserver() override {}
+
+  bool root_destroyed() const { return root_destroyed_; }
+
+  // aura::WindowTreeHostObserver::
+  void OnHostCloseRequested(const aura::WindowTreeHost* host) override {
+    root_destroyed_ = true;
+  }
+
+ private:
+  bool root_destroyed_ = false;
+
+  DISALLOW_COPY_AND_ASSIGN(CloseWindowWindowTreeHostObserver);
+};
+
+}  // namespace
+
+TEST_F(WindowTreeClientClientTest, CloseWindow) {
+  WindowTreeHostMus window_tree_host(window_tree_client_impl());
+  window_tree_host.InitHost();
+  CloseWindowWindowTreeHostObserver observer;
+  window_tree_host.AddObserver(&observer);
+  Window* top_level = window_tree_host.window();
+
+  CloseWindowTestWindowDelegate window_delegate1;
+  Window child1(&window_delegate1);
+  child1.Init(ui::LAYER_NOT_DRAWN);
+  top_level->AddChild(&child1);
+  CloseWindowTestWindowDelegate window_delegate2;
+  Window child2(&window_delegate2);
+  child2.Init(ui::LAYER_NOT_DRAWN);
+  top_level->AddChild(&child2);
+
+  // Close a child window should only trigger its window delegate to close
+  // that window.
+  EXPECT_FALSE(window_delegate1.window_closed());
+  window_tree_client()->RequestClose(server_id(&child1));
+  EXPECT_TRUE(window_delegate1.window_closed());
+  EXPECT_FALSE(window_delegate2.window_closed());
+  EXPECT_FALSE(observer.root_destroyed());
+
+  // Close a root window should send close request to the observer of its
+  // WindowTreeHost.
+  window_tree_client()->RequestClose(server_id(top_level));
+  EXPECT_TRUE(observer.root_destroyed());
+  EXPECT_FALSE(window_delegate2.window_closed());
+}
+
 // Tests both SetCapture and ReleaseCapture, to ensure that Window is properly
 // updated on failures.
 TEST_F(WindowTreeClientWmTest, ExplicitCapture) {
   root_window()->SetCapture();
   EXPECT_TRUE(root_window()->HasCapture());
   ASSERT_TRUE(window_tree()->AckSingleChangeOfType(
       WindowTreeChangeType::CAPTURE, false));
   EXPECT_FALSE(root_window()->HasCapture());
 
   root_window()->SetCapture();
@@ skipping 314 matching lines @@
   window_tree_client()->OnTopLevelCreated(change_id, std::move(data),
                                           display_id, true);
 
   // aura::Window should operate in DIP and aura::WindowTreeHost should operate
   // in pixels.
   EXPECT_EQ(gfx::Rect(0, 0, 3, 4), top_level->bounds());
   EXPECT_EQ(gfx::Rect(2, 4, 6, 8), top_level->GetHost()->GetBoundsInPixels());
 }
 
 }  // namespace aura