Update Chrome Upstream flow to reflect new UI mocks

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 "ui/views/bubble/bubble_frame_view.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "build/build_config.h"
@@ skipping 150 matching lines @@
   EXPECT_EQ(kColor, frame.bubble_border()->background_color());
 
   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());
 }
 
+TEST_F(BubbleFrameViewTest,
+       FootnoteContainerViewShouldMatchVisibilityOfFirstChild) {
+  TestBubbleFrameView frame(this);
+  View* footnote_dummy_view = new StaticSizedView(gfx::Size(200, 200));
+  footnote_dummy_view->SetVisible(false);
+  frame.SetFootnoteView(footnote_dummy_view);
+  View* footnote_container_view = footnote_dummy_view->parent();
+  EXPECT_FALSE(footnote_container_view->visible());
+  footnote_dummy_view->SetVisible(true);
+  EXPECT_TRUE(footnote_container_view->visible());
+  footnote_dummy_view->SetVisible(false);
+  EXPECT_FALSE(footnote_container_view->visible());
+}
+
 // Tests that the arrow is mirrored as needed to better fit the screen.
 TEST_F(BubbleFrameViewTest, GetUpdatedWindowBounds) {
   TestBubbleFrameView frame(this);
   gfx::Rect window_bounds;
 
   gfx::Insets insets = frame.bubble_border()->GetInsets();
   int xposition = 95 - insets.width();
 
   // Test that the info bubble displays normally when it fits.
   frame.bubble_border()->set_arrow(BubbleBorder::TOP_LEFT);
@@ skipping 277 matching lines @@
       gfx::Rect(900, 900, 50, 50),  // |anchor_rect|
       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::Rect preferred_rect(frame.GetPreferredSize());
-  // Expect that a border has been added to the preferred size.
-  preferred_rect.Inset(frame.bubble_border()->GetInsets());
+  {
+    // Test border/insets.
+    TestBubbleFrameView frame(this);
+    gfx::Rect preferred_rect(frame.GetPreferredSize());
+    // Expect that a border has been added to the preferred size.
+    preferred_rect.Inset(frame.bubble_border()->GetInsets());
 
-  gfx::Size expected_size(kPreferredClientWidth + kExpectedAdditionalWidth,
-                          kPreferredClientHeight + kExpectedAdditionalHeight);
-  EXPECT_EQ(expected_size, preferred_rect.size());
+    gfx::Size expected_size(kPreferredClientWidth + kExpectedAdditionalWidth,
+                            kPreferredClientHeight + kExpectedAdditionalHeight);
+    EXPECT_EQ(expected_size, preferred_rect.size());
+  }
+  {

[msw, 2017/07/10 19:02:24]

nit: Make a separate new test fixture GetPreferredSizeWithFootnote, instead of
making separate scoped blocks within the existing fixture.

[Jared Saul, 2017/07/10 19:24:40]

Done.

+    // Test footnote view: adding a footnote should increase the preferred size,
+    // but only when the footnote is visible.
+    TestBubbleFrameView frame(this);
+
+    constexpr int kFootnoteHeight = 20;
+    const gfx::Size no_footnote_size = frame.GetPreferredSize();

[tapted, 2017/07/10 03:52:05]

To cater for the border, probably something like

constexpr int kFootnoteTopBorderThickness = 1;

[Jared Saul, 2017/07/10 19:24:40]

Done.

+    View* footnote = new StaticSizedView(gfx::Size(10, kFootnoteHeight));
+    footnote->SetVisible(false);
+    frame.SetFootnoteView(footnote);
+    EXPECT_EQ(no_footnote_size, frame.GetPreferredSize());  // No change.
+
+    footnote->SetVisible(true);
+    gfx::Size with_footnote_size = no_footnote_size;
+    with_footnote_size.Enlarge(
+        0, kFootnoteHeight + frame.content_margins().height());
+    EXPECT_EQ(with_footnote_size, frame.GetPreferredSize());
+
+    footnote->SetVisible(false);
+    EXPECT_EQ(no_footnote_size, frame.GetPreferredSize());
+  }
 }
 
 TEST_F(BubbleFrameViewTest, GetMinimumSize) {
   TestBubbleFrameView frame(this);
   gfx::Rect minimum_rect(frame.GetMinimumSize());
   // Expect that a border has been added to the minimum size.
   minimum_rect.Inset(frame.bubble_border()->GetInsets());
 
   gfx::Size expected_size(kMinimumClientWidth + kExpectedAdditionalWidth,
                           kMinimumClientHeight + kExpectedAdditionalHeight);
@@ skipping 88 matching lines @@
   // If the DialogDelegate asks not to snap, it should not snap.
   delegate.set_override_snap(false);
   Widget* w2 = BubbleDialogDelegateView::CreateBubble(&delegate);
   w2->Show();
   EXPECT_EQ(delegate.GetPreferredSize().width(),
             w2->GetWindowBoundsInScreen().width());
   w2->CloseNow();
 }
 
 }  // namespace views