Finish eliminating PlatformWindowMus

ui/views/mus/native_widget_mus_unittest.cc

 // Copyright 2016 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/views/mus/native_widget_mus.h"
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/tests/window_tree_client_impl_private.h"
@@ skipping 136 matching lines @@
  public:
   NativeWidgetMusTest() {}
   ~NativeWidgetMusTest() override {}
 
   // Creates a test widget. Takes ownership of |delegate|.
   std::unique_ptr<Widget> CreateWidget(WidgetDelegate* delegate) {
     std::unique_ptr<Widget> widget(new Widget());
     Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
     params.delegate = delegate;
     params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-    params.bounds = gfx::Rect(10, 20, 100, 200);
+    params.bounds = initial_bounds();
     widget->Init(params);
     return widget;
   }
 
   int ack_callback_count() { return ack_callback_count_; }
 
   void AckCallback(mus::mojom::EventResult result) {
     ack_callback_count_++;
     EXPECT_EQ(mus::mojom::EventResult::HANDLED, result);
   }
@@ skipping 10 matching lines @@
   // Simulates an input event to the NativeWidget.
   void OnWindowInputEvent(
       NativeWidgetMus* native_widget,
       const ui::Event& event,
       std::unique_ptr<base::Callback<void(mus::mojom::EventResult)>>*
       ack_callback) {
     native_widget->OnWindowInputEvent(native_widget->window(), event,
                                       ack_callback);
   }
 
+ protected:
+  gfx::Rect initial_bounds() {
+    return gfx::Rect(10, 20, 100, 200);
+  }
+
  private:
   int ack_callback_count_ = 0;
 
   DISALLOW_COPY_AND_ASSIGN(NativeWidgetMusTest);
 };
 
 // Tests communication of activation and focus between Widget and
 // NativeWidgetMus.
 TEST_F(NativeWidgetMusTest, OnActivationChanged) {
   std::unique_ptr<Widget> widget(CreateWidget(nullptr));
@@ skipping 286 matching lines @@
 
   widget->SetCapture(content);
   EXPECT_TRUE(widget_private->HasCapture());
   EXPECT_TRUE(mus_window->HasCapture());
 
   widget->ReleaseCapture();
   EXPECT_FALSE(widget_private->HasCapture());
   EXPECT_FALSE(mus_window->HasCapture());
 }
 
+// Ensure that manually setting NativeWidgetMus's mus::Window bounds also
+// updates its WindowTreeHost bounds.
+TEST_F(NativeWidgetMusTest, SetMusWindowBounds) {
+  std::unique_ptr<Widget> widget(CreateWidget(nullptr));
+  widget->Show();
+  View* content = new View;
+  widget->GetContentsView()->AddChildView(content);
+  NativeWidgetMus* native_widget =
+      static_cast<NativeWidgetMus*>(widget->native_widget_private());
+  mus::Window* mus_window = native_widget->window();
+
+  gfx::Rect start_bounds = initial_bounds();
+  gfx::Rect end_bounds = gfx::Rect(40, 50, 60, 70);
+  EXPECT_NE(start_bounds, end_bounds);
+
+  EXPECT_EQ(start_bounds, mus_window->bounds());
+  EXPECT_EQ(start_bounds, native_widget->window_tree_host()->GetBounds());
+
+  mus_window->SetBounds(end_bounds);
+
+  EXPECT_EQ(end_bounds, mus_window->bounds());
+
+  // Main check for this test: Setting |mus_window| bounds while bypassing
+  // |native_widget| must update window_tree_host bounds.
+  EXPECT_EQ(end_bounds, native_widget->window_tree_host()->GetBounds());
+}
+
 }  // namespace views