Re-land 4ced9f3c7e9534b6b730d: Fix layout of BubbleFrameView when there's only a close button in th…

ui/views/bubble/bubble_frame_view_unittest.cc

Index: ui/views/bubble/bubble_frame_view_unittest.cc
diff --git a/ui/views/bubble/bubble_frame_view_unittest.cc b/ui/views/bubble/bubble_frame_view_unittest.cc
index bf955dd451c640273688efb5f36fae2e0198a691..3474899d99a83b9c15b20173e5287c20bade7266 100644
--- a/ui/views/bubble/bubble_frame_view_unittest.cc
+++ b/ui/views/bubble/bubble_frame_view_unittest.cc
@@ -145,12 +145,12 @@ TEST_F(BubbleFrameViewTest, GetBoundsForClientViewWithClose) {
   EXPECT_EQ(kArrow, frame.bubble_border()->arrow());
   EXPECT_EQ(kColor, frame.bubble_border()->background_color());
 
-  int margin_x = frame.content_margins().left();
-  int margin_y = frame.content_margins().top() +
-                 frame.GetCloseButtonForTest()->height();
-  gfx::Insets insets = frame.bubble_border()->GetInsets();
-  EXPECT_EQ(insets.left() + margin_x, frame.GetBoundsForClientView().x());
-  EXPECT_EQ(insets.top() + margin_y, frame.GetBoundsForClientView().y());
+  gfx::Insets frame_insets = frame.GetInsets();
+  gfx::Insets border_insets = frame.bubble_border()->GetInsets();
+  EXPECT_EQ(border_insets.left() + frame_insets.left(),
+            frame.GetBoundsForClientView().x());
+  EXPECT_EQ(border_insets.top() + frame_insets.top(),
+            frame.GetBoundsForClientView().y());
 }
 
 // Tests that the arrow is mirrored as needed to better fit the screen.