MacViews: Fix failing bubble frame view tests after r375729.

ui/views/bubble/bubble_frame_view_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 "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "build/build_config.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
@@ skipping 12 matching lines @@
 
 const BubbleBorder::Arrow kArrow = BubbleBorder::TOP_LEFT;
 const SkColor kColor = SK_ColorRED;
 const int kMargin = 6;
 const int kMinimumClientWidth = 100;
 const int kMinimumClientHeight = 200;
 const int kMaximumClientWidth = 300;
 const int kMaximumClientHeight = 300;
 const int kPreferredClientWidth = 150;
 const int kPreferredClientHeight = 250;
-const int kExpectedBorderWidth = 22;
-const int kExpectedBorderHeight = 29;
+
+// These account for non-client areas like the title bar, footnote etc. However
+// these do not take the bubble border into consideration.
+const int kExpectedAdditionalWidth = 12;
+const int kExpectedAdditionalHeight = 12;
 
 class TestBubbleFrameViewWidgetDelegate : public WidgetDelegate {
  public:
   TestBubbleFrameViewWidgetDelegate(Widget* widget) : widget_(widget) {}
 
   ~TestBubbleFrameViewWidgetDelegate() override {}
 
   // WidgetDelegate overrides:
   Widget* GetWidget() override { return widget_; }
   const Widget* GetWidget() const override { return widget_; }
@@ skipping 365 matching lines @@
       gfx::Size(500, 500),          // |client_size|
       true);                        // |adjust_if_offscreen|
   EXPECT_EQ(BubbleBorder::RIGHT_CENTER, frame.bubble_border()->arrow());
   EXPECT_EQ(window_bounds.bottom(), 1000);
   EXPECT_EQ(window_bounds.y() +
             frame.bubble_border()->GetArrowOffset(window_bounds.size()), 925);
 }
 
 TEST_F(BubbleFrameViewTest, GetPreferredSize) {
   TestBubbleFrameView frame(this);
-  gfx::Size preferred_size = frame.GetPreferredSize();
+  gfx::Rect preferred_rect(frame.GetPreferredSize());
   // Expect that a border has been added to the preferred size.
-  EXPECT_EQ(kPreferredClientWidth + kExpectedBorderWidth,
-            preferred_size.width());
-  EXPECT_EQ(kPreferredClientHeight + kExpectedBorderHeight,
-            preferred_size.height());
+  preferred_rect.Inset(frame.bubble_border()->GetInsets());
+
+  gfx::Size expected_size(kPreferredClientWidth + kExpectedAdditionalWidth,
+                          kPreferredClientHeight + kExpectedAdditionalHeight);
+  EXPECT_EQ(expected_size, preferred_rect.size());
 }
 
 TEST_F(BubbleFrameViewTest, GetMinimumSize) {
   TestBubbleFrameView frame(this);
-  gfx::Size minimum_size = frame.GetMinimumSize();
+  gfx::Rect minimum_rect(frame.GetMinimumSize());
   // Expect that a border has been added to the minimum size.
-  EXPECT_EQ(kMinimumClientWidth + kExpectedBorderWidth, minimum_size.width());
-  EXPECT_EQ(kMinimumClientHeight + kExpectedBorderHeight,
-            minimum_size.height());
+  minimum_rect.Inset(frame.bubble_border()->GetInsets());
+
+  gfx::Size expected_size(kMinimumClientWidth + kExpectedAdditionalWidth,
+                          kMinimumClientHeight + kExpectedAdditionalHeight);
+  EXPECT_EQ(expected_size, minimum_rect.size());
 }
 
 TEST_F(BubbleFrameViewTest, GetMaximumSize) {
   TestBubbleFrameView frame(this);
-  gfx::Size maximum_size = frame.GetMaximumSize();
+  gfx::Rect maximum_rect(frame.GetMaximumSize());
 #if defined(OS_WIN)
   // On Windows, GetMaximumSize causes problems with DWM, so it should just be 0
   // (unlimited). See http://crbug.com/506206.
-  EXPECT_EQ(0, maximum_size.width());
-  EXPECT_EQ(0, maximum_size.height());
+  EXPECT_EQ(gfx::Size(), maximum_rect.size());
 #else
+  maximum_rect.Inset(frame.bubble_border()->GetInsets());
+
   // Should ignore the contents view's maximum size and use the preferred size.
-  EXPECT_EQ(kPreferredClientWidth + kExpectedBorderWidth, maximum_size.width());
-  EXPECT_EQ(kPreferredClientHeight + kExpectedBorderHeight,
-            maximum_size.height());
+  gfx::Size expected_size(kPreferredClientWidth + kExpectedAdditionalWidth,
+                          kPreferredClientHeight + kExpectedAdditionalHeight);
+  EXPECT_EQ(expected_size, maximum_rect.size());
 #endif
 }
 
 }  // namespace views