Update Chrome Upstream flow to reflect new UI mocks

ui/views/bubble/bubble_frame_view.h

 // 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.
 
 #ifndef UI_VIEWS_BUBBLE_BUBBLE_FRAME_VIEW_H_
 #define UI_VIEWS_BUBBLE_BUBBLE_FRAME_VIEW_H_
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
@@ skipping 78 matching lines @@
   Button* GetCloseButtonForTest() { return close_; }
 
  protected:
   // Returns the available screen bounds if the frame were to show in |rect|.
   virtual gfx::Rect GetAvailableScreenBounds(const gfx::Rect& rect) const;
 
   bool IsCloseButtonVisible() const;
   gfx::Rect GetCloseButtonMirroredBounds() const;
 
  private:
+  class FootnoteContainerView;
   FRIEND_TEST_ALL_PREFIXES(BubbleFrameViewTest, GetBoundsForClientView);
   FRIEND_TEST_ALL_PREFIXES(BubbleFrameViewTest, RemoveFootnoteView);
+  FRIEND_TEST_ALL_PREFIXES(
+      BubbleFrameViewTest,
+      FootnoteContainerViewShouldMatchVisibilityOfFirstChild);
   FRIEND_TEST_ALL_PREFIXES(BubbleDelegateTest, CloseReasons);
   FRIEND_TEST_ALL_PREFIXES(BubbleDialogDelegateTest, CloseMethods);
 
   // Mirrors the bubble's arrow location on the |vertical| or horizontal axis,
   // if the generated window bounds don't fit in the monitor bounds.
   void MirrorArrowIfOffScreen(bool vertical,
                               const gfx::Rect& anchor_rect,
                               const gfx::Size& client_size);
 
   // Adjust the bubble's arrow offsets if the generated window bounds don't fit
@@ skipping 12 matching lines @@
 
   // Margins between the content and the inside of the border, in pixels.
   gfx::Insets content_margins_;
 
   // The optional title icon, title, and (x) close button.
   views::ImageView* title_icon_;
   Label* title_;
   Button* close_;
 
   // A view to contain the footnote view, if it exists.
-  View* footnote_container_;
+  FootnoteContainerView* footnote_container_;
 
   // Whether the close button was clicked.
   bool close_button_clicked_;
 
   DISALLOW_COPY_AND_ASSIGN(BubbleFrameView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_BUBBLE_BUBBLE_FRAME_VIEW_H_