[ash] Made TriView's re-layout automatically when a child container's visibility changes.

ash/system/tray/tri_view_unittest.cc

 // Copyright 2016 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 <memory>
+#include <utility>
 
 #include "ash/system/tray/tri_view.h"
 #include "base/memory/ptr_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/test/test_layout_manager.h"
 #include "ui/views/test/test_views.h"
 #include "ui/views/view.h"
@@ skipping 354 matching lines @@
   EXPECT_NE(kMinHeight, GetMinHeight(TriView::Container::CENTER));
   EXPECT_NE(kMinHeight, GetMinHeight(TriView::Container::END));
 
   tri_view_->SetMinHeight(kMinHeight);
 
   EXPECT_EQ(kMinHeight, GetMinHeight(TriView::Container::START));
   EXPECT_EQ(kMinHeight, GetMinHeight(TriView::Container::CENTER));
   EXPECT_EQ(kMinHeight, GetMinHeight(TriView::Container::END));
 }
 
+TEST_F(TriViewTest, ChangingContainersVisibilityPerformsLayout) {
+  const int kViewWidth = 10;
+  const int kViewHeight = 10;
+  const gfx::Size kEndViewSize(kViewWidth, kViewHeight);
+
+  tri_view_->SetBounds(0, 0, 3 * kViewWidth, kViewHeight);
+  tri_view_->SetFlexForContainer(TriView::Container::CENTER, 1.f);
+
+  views::View* start_child = new views::View();
+  start_child->SetPreferredSize(kEndViewSize);
+
+  views::View* center_child = new views::View();
+  center_child->SetPreferredSize(gfx::Size(2 * kViewWidth, kViewHeight));
+
+  views::View* end_child = new views::View();
+  end_child->SetPreferredSize(kEndViewSize);
+
+  tri_view_->AddView(TriView::Container::START, start_child);
+  tri_view_->AddView(TriView::Container::CENTER, center_child);
+  tri_view_->AddView(TriView::Container::END, end_child);
+
+  tri_view_->Layout();
+
+  EXPECT_EQ(gfx::Size(kViewWidth, kViewHeight), center_child->size());
+
+  tri_view_->SetContainerVisible(TriView::Container::END, false);
+
+  EXPECT_EQ(gfx::Size(2 * kViewWidth, kViewHeight), center_child->size());
+}
+
 }  // namespace ash