MacViews: Fix WidgetObserverTest.WidgetBoundsChangedNative after r400463

ui/views/widget/widget_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 <algorithm>
 #include <memory>
 #include <set>
 
 #include "base/bind.h"
 #include "base/macros.h"
@@ skipping 870 matching lines @@
 // An extension to WidgetBoundsChanged to ensure notifications are forwarded
 // by the NativeWidget implementation.
 TEST_F(WidgetObserverTest, WidgetBoundsChangedNative) {
   // Don't use NewWidget(), so that the Init() flow can be observed to ensure
   // consistency across platforms.
   Widget* widget = new Widget();  // Note: owned by NativeWidget.
   widget->AddObserver(this);
 
   EXPECT_FALSE(widget_bounds_changed());
 
+  Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
+
+  // Use an origin within the work area since platforms (e.g. Mac) may move a
+  // window into the work area when showing, triggering a bounds change.
+  params.bounds = gfx::Rect(50, 50, 100, 100);
+
   // Init causes a bounds change, even while not showing. Note some platforms
   // cause a bounds change even when the bounds are empty. Mac does not.
-  Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
-  params.bounds = gfx::Rect(0, 0, 100, 100);
   widget->Init(params);
   EXPECT_TRUE(widget_bounds_changed());
   reset();
 
   // Resizing while hidden, triggers a change.
   widget->SetSize(gfx::Size(160, 100));
   EXPECT_FALSE(widget->IsVisible());
   EXPECT_TRUE(widget_bounds_changed());
   reset();
 
@@ skipping 11 matching lines @@
   // Resizing while shown.
   widget->SetSize(gfx::Size(170, 100));
   EXPECT_TRUE(widget_bounds_changed());
   reset();
 
   // Resize to the same thing while shown does nothing.
   widget->SetSize(gfx::Size(170, 100));
   EXPECT_FALSE(widget_bounds_changed());
   reset();
 
+  // Move, but don't change the size.
+  widget->SetBounds(gfx::Rect(110, 110, 170, 100));
+  // Currently fails on Mus. http://crbug.com/622575.
+  if (IsMus())
+    EXPECT_FALSE(widget_bounds_changed());
+  else
+    EXPECT_TRUE(widget_bounds_changed());
+  reset();
+
+  // Moving to the same place does nothing.
+  widget->SetBounds(gfx::Rect(110, 110, 170, 100));
+  EXPECT_FALSE(widget_bounds_changed());
+  reset();
+
   // No bounds change when closing.
   widget->CloseNow();
   EXPECT_FALSE(widget_bounds_changed());
 }
 
 // Test correct behavior when widgets close themselves in response to visibility
 // changes.
 TEST_F(WidgetObserverTest, ClosingOnHiddenParent) {
   WidgetAutoclosePtr parent(NewWidget());
   Widget* child = CreateChildPlatformWidget(parent->GetNativeView());
@@ skipping 2764 matching lines @@
   EXPECT_FALSE(!!IsWindow(owned_hwnd));
   EXPECT_TRUE(!!IsWindowEnabled(top_hwnd));
 
   top_level_widget.CloseNow();
 }
 
 #endif  // defined(OS_WIN)
 
 }  // namespace test
 }  // namespace views